Documentation corrections from Wallace Reis++.

For RT #118593, 118595, 118597, 118599.

8 files changed, 17 insertions, 19 deletions

diff --git a/AUTHORS b/AUTHORS
index c945fc603d..107f7b247f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1157,6 +1157,7 @@ Vladimir Timofeev		<vovkasm@gmail.com>
 Volker Schatz			<perldoc@volkerschatz.com>
 W. Geoffrey Rommel		<grommel@sears.com>
 W. Phillip Moore		<wpm@ms.com>
+Wallace Reis			<wreis@cpan.org>
 Walt Mankowski			<waltman@pobox.com>
 Walter Briscoe			<w.briscoe@ponl.com>
 Warren Hyde			<whyde@pezz.sps.mot.com>
diff --git a/ext/Pod-Html/testdir/perlpodspec-copy.pod b/ext/Pod-Html/testdir/perlpodspec-copy.pod
index 4f914ef0e4..97319c90b2 100644
--- a/ext/Pod-Html/testdir/perlpodspec-copy.pod
+++ b/ext/Pod-Html/testdir/perlpodspec-copy.pod
@@ -3,6 +3,11 @@
 
 perlpodspeccopy - Plain Old Documentation: format specification and notes
 
+=head1 DISCLAIMER
+
+This is a pod file used for testing purposes by the test suite, please
+see L<perlpodspec>.
+
 =head1 DESCRIPTION
 
 This document is detailed notes on the Pod markup language.  Most
diff --git a/ext/Pod-Html/testdir/perlvar-copy.pod b/ext/Pod-Html/testdir/perlvar-copy.pod
index 9cb9b68ce8..efb00a012d 100644
--- a/ext/Pod-Html/testdir/perlvar-copy.pod
+++ b/ext/Pod-Html/testdir/perlvar-copy.pod
@@ -2,6 +2,11 @@
 
 perlvarcopy - Perl predefined variables
 
+=head1 DISCLAIMER
+
+This is a pod file used for testing purposes by the test suite, please
+see L<perlvar>.
+
 =head1 DESCRIPTION
 
 =head2 Predefined Names
diff --git a/pod/perlform.pod b/pod/perlform.pod
index 190d12e506..84b6fc59df 100644
--- a/pod/perlform.pod
+++ b/pod/perlform.pod
@@ -301,7 +301,7 @@ stage in the expression to single-step the debugger through):
 
 If you use the English module, you can even read the variable names:
 
-    use English '-no_match_vars';
+    use English;
     $ofh = select(OUTF);
     $FORMAT_NAME     = "My_Other_Format";
     $FORMAT_TOP_NAME = "My_Top_Format";
diff --git a/pod/perlipc.pod b/pod/perlipc.pod
index 6f07fb7dbe..69567e937b 100644
--- a/pod/perlipc.pod
+++ b/pod/perlipc.pod
@@ -546,7 +546,7 @@ write to the filehandle you opened and your kid will find it in I<his>
 STDIN.  If you open a pipe I<from> minus, you can read from the filehandle
 you opened whatever your kid writes to I<his> STDOUT.
 
-    use English qw[ -no_match_vars ];
+    use English;
     my $PRECIOUS = "/path/to/some/safe/file";
     my $sleep_count;
     my $pid;
diff --git a/pod/perlop.pod b/pod/perlop.pod
index 7db132c024..828b3a6c68 100644
--- a/pod/perlop.pod
+++ b/pod/perlop.pod
@@ -1705,8 +1705,8 @@ you can use any pair of non-whitespace (ASCII) characters
 as delimiters.  This is particularly useful for matching path names
 that contain "/", to avoid LTS (leaning toothpick syndrome).  If "?" is
 the delimiter, then a match-only-once rule applies,
-described in C<m?PATTERN?> below.
-If "'" is the delimiter, no interpolation is performed on the PATTERN.
+described in C<m?PATTERN?> below. If "'" (single quote) is the delimiter,
+no interpolation is performed on the PATTERN.
 When using a character valid in an identifier, whitespace is required
 after the C<m>.
 
diff --git a/pod/perlsec.pod b/pod/perlsec.pod
index 0e535afb68..e480cb3e69 100644
--- a/pod/perlsec.pod
+++ b/pod/perlsec.pod
@@ -307,7 +307,7 @@ not called with a string that the shell could expand.  This is by far the
 best way to call something that might be subjected to shell escapes: just
 never call the shell at all.  
 
-        use English '-no_match_vars';
+        use English;
         die "Can't fork: $!" unless defined($pid = open(KID, "-|"));
         if ($pid) {           # parent
             while (<KID>) {
diff --git a/pod/perlvar.pod b/pod/perlvar.pod
index 14324a5df2..47960044df 100644
--- a/pod/perlvar.pod
+++ b/pod/perlvar.pod
@@ -61,11 +61,7 @@ Nevertheless, if you wish to use long variable names, you need only say:
 
 at the top of your program.  This aliases all the short names to the long
 names in the current package.  Some even have medium names, generally
-borrowed from B<awk>.  To avoid a performance hit, if you don't need the
-C<$PREMATCH>, C<$MATCH>, or C<$POSTMATCH> it's best to use the C<English>
-module without them:
-
-    use English '-no_match_vars';
+borrowed from B<awk>. For more info, please see L<English>.
 
 Before you continue, note the sort order for variables.  In general, we
 first list the variables in case-insensitive, almost-lexigraphical
@@ -783,15 +779,6 @@ we have not made another match:
     $1 is Mutt; $2 is Jeff
     $1 is Wallace; $2 is Grommit
 
-If you are using Perl v5.18 or earlier, note that C<use
-English> imposes a considerable performance penalty on all regular
-expression matches in a program because it uses the C<$`>, C<$&>, and
-C<$'>, regardless of whether they occur in the scope of C<use
-English>.  For that reason, saying C<use English> in libraries is
-strongly discouraged unless you import it without the match variables:
-
-    use English '-no_match_vars'
-
 The C<Devel::NYTProf> and C<Devel::FindAmpersand>
 modules can help you find uses of these
 problematic match variables in your code.