Integrate from mainperl.

p4raw-id: //depot/cfgperl@2460

4 files changed, 16 insertions, 15 deletions

diff --git a/pod/perl.pod b/pod/perl.pod
index 0d2251e04b..1b886d01e0 100644
--- a/pod/perl.pod
+++ b/pod/perl.pod
@@ -119,9 +119,9 @@ BASIC-PLUS.)  Expression syntax corresponds quite closely to C
 expression syntax.  Unlike most Unix utilities, Perl does not
 arbitrarily limit the size of your data--if you've got the memory,
 Perl can slurp in your whole file as a single string.  Recursion is of
-unlimited depth.  And the tables used by hashes (previously called
+unlimited depth.  And the tables used by hashes (sometimes called
 "associative arrays") grow as necessary to prevent degraded
-performance.  Perl uses sophisticated pattern matching techniques to
+performance.  Perl can use sophisticated pattern matching techniques to
 scan large amounts of data very quickly.  Although optimized for
 scanning text, Perl can also deal with binary data, and can make dbm
 files look like hashes.  Setuid Perl scripts are safer than C programs
@@ -298,9 +298,10 @@ and syswrite().)
 
 While none of the built-in data types have any arbitrary size limits
 (apart from memory size), there are still a few arbitrary limits:  a
-given variable name may not be longer than 255 characters, and no
-component of your PATH may be longer than 255 if you use B<-S>.  A regular
-expression may not compile to more than 32767 bytes internally.
+given variable name may not be longer than 251 characters.  Line numbers
+displayed by diagnostics are internally stored as short integers,
+so they are limited to a maximum of 65535 (higher numbers usually being
+affected by wraparound).
 
 You may mail your bug reports (be sure to include full configuration
 information as output by the myconfig program in the perl source tree,
diff --git a/pod/perl5005delta.pod b/pod/perl5005delta.pod
index 62787f5028..89088b2b03 100644
--- a/pod/perl5005delta.pod
+++ b/pod/perl5005delta.pod
@@ -884,6 +884,14 @@ a B<-e> switch.  Maybe your /tmp partition is full, or clobbered.
 (F) The create routine failed for some reason while trying to process
 a B<-e> switch.  Maybe your /tmp partition is full, or clobbered.
 
+=item regexp too big
+
+(F) The current implementation of regular expressions uses shorts as
+address offsets within a string.  Unfortunately this means that if
+the regular expression compiles to longer than 32767, it'll blow up.
+Usually when you want a regular expression this big, there is a better
+way to do it with multiple statements.  See L<perlre>.
+
 =back
 
 =head1 BUGS
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 50552cf8d0..0b157c1f7c 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -2241,14 +2241,6 @@ expression compiler gave it.
 
 (P) A "can't happen" error, because safemalloc() should have caught it earlier.
 
-=item regexp too big
-
-(F) The current implementation of regular expressions uses shorts as
-address offsets within a string.  Unfortunately this means that if
-the regular expression compiles to longer than 32767, it'll blow up.
-Usually when you want a regular expression this big, there is a better
-way to do it with multiple statements.  See L<perlre>.
-
 =item Reversed %s= operator
 
 (W) You wrote your assignment operator backwards.  The = must always
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 3b52b8413c..fa8454739f 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -15,7 +15,7 @@ operator.  A unary operator generally provides a scalar context to its
 argument, while a list operator may provide either scalar and list
 contexts for its arguments.  If it does both, the scalar arguments will
 be first, and the list argument will follow.  (Note that there can ever
-be only one list argument.)  For instance, splice() has three scalar
+be only one such list argument.)  For instance, splice() has three scalar
 arguments followed by a list.
 
 In the syntax descriptions that follow, list operators that expect a
@@ -1473,7 +1473,7 @@ L</last>, L</next>, and L</redo> for additional control flow.
 Enter BLOCK as LOOPVAR set in turn to each element of LIST.
 For example:
 
-	foreach $rolling (@stones) { print "rolling $stone\n" }
+	foreach $rolling (@stones) { print "$rolling stone\n" }
 
 	foreach my $file (@files)  { print "file $file\n" }