Integrate from mainperl.

p4raw-id: //depot/cfgperl@3393

3 files changed, 25 insertions, 4 deletions

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index d2ef10daa0..5114ce1731 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -225,7 +225,7 @@ been fixed.
 
 fork(), exec(), system(), qx// and pipe open()s now flush the buffers
 of all files that were opened for output at the time the operation
-was attempted.  The mostly eliminates the often confusing effects of
+was attempted.  This mostly eliminates the often confusing effects of
 buffering mishaps suffered by users unaware of how Perl internally
 handled I/O.
 
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 4b18882b28..b83b577b03 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -971,6 +971,11 @@ weren't.
 subscript.  But to the left of the brackets was an expression that
 didn't look like an array reference, or anything else subscriptable.
 
+=item Can't weaken a nonreference
+
+(F) You attempted to weaken something that was not a reference.  Only
+references can be weakened.
+
 =item Can't x= to read-only value
 
 (F) You tried to repeat a constant value (often the undefined value) with
@@ -1983,6 +1988,11 @@ See L<perlform>.
 (P) The savestack was requested to restore more localized values than there
 are in the savestack.
 
+=item panic: del_backref
+
+(P) Failed an internal consistency check while trying to reset a weak
+reference.
+
 =item panic: die %s
 
 (P) We popped the context stack to an eval context, and then discovered
@@ -2043,6 +2053,11 @@ invalid enum on the top of it.
 
 (P) Something requested a negative number of bytes of malloc.
 
+=item panic: magic_killbackrefs
+
+(P) Failed an internal consistency check while trying to reset all weak
+references to an object.
+
 =item panic: mapstart
 
 (P) The compiler is screwed up with respect to the map() function.
@@ -2285,6 +2300,11 @@ to use parens. In any case, a hash requires key/value B<pairs>.
     %hash = ( one => 1, two => 2, );	# right
     %hash = qw( one 1 two 2 );			# also fine
 
+=item Reference is already weak
+
+(W) You have attempted to weaken a reference that is already weak.
+Doing so has no effect.
+
 =item Reference miscount in sv_replace()
 
 (W) The internal sv_replace() function was handed a new SV with a
diff --git a/pod/perlguts.pod b/pod/perlguts.pod
index b71337c137..ad4c702b07 100644
--- a/pod/perlguts.pod
+++ b/pod/perlguts.pod
@@ -2426,9 +2426,10 @@ set and the variable does not exist then NULL is returned.
 
 =item perl_get_cv
 
-Returns the CV of the specified Perl sub.  If C<create> is set and the Perl
-variable does not exist then it will be created.  If C<create> is not
-set and the variable does not exist then NULL is returned.
+Returns the CV of the specified Perl subroutine.  If C<create> is set and
+the Perl subroutine does not exist then it will be declared (which has
+the same effect as saying C<sub name;>).  If C<create> is not
+set and the subroutine does not exist then NULL is returned.
 
 	CV*	perl_get_cv (const char* name, I32 create)