perldelta for 3b91d897

[perl5.git] / pod / perldiag.pod

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index d1bb1eb..0457474 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -2728,13 +2728,6 @@ instead, except within S<C<(?[   ])>>, where it is a fatal error.
 The S<<-- HERE> shows whereabouts in the regular expression the
 escape was discovered.
 
-=item %s: Invalid handshake key got %p needed %p, binaries are mismatched
-
-(P) A dynamic loading library C<.so> or C<.dll> was being loaded into the
-process that was built against a different build of perl than the
-said library was compiled against.  Reinstalling the XS module will
-likely fix this error.
-
 =item Invalid hexadecimal number in \N{U+...}
 
 =item Invalid hexadecimal number in \N{U+...} in regex; marked by
@@ -2980,6 +2973,13 @@ L<perlfunc/listen>.
 form of C<open> does not support pipes, such as C<open($pipe, '|-', @args)>.
 Use the two-argument C<open($pipe, '|prog arg1 arg2...')> form instead.
 
+=item %s: loadable library and perl binaries are mismatched (got handshake key %p, needed %p)
+
+(P) A dynamic loading library C<.so> or C<.dll> was being loaded into the
+process that was built against a different build of perl than the
+said library was compiled against.  Reinstalling the XS module will
+likely fix this error.
+
 =item Locale '%s' may not work well.%s
 
 (W locale) The named locale that Perl is now trying to use is not fully
@@ -3307,7 +3307,7 @@ file-specification as an argument.  See L<perlfunc/require>.
 
 (F) Missing right brace in C<\x{...}>, C<\p{...}>, C<\P{...}>, or C<\N{...}>.
 
-=item Missing right brace on \\N{}
+=item Missing right brace on \N{}
 
 =item Missing right brace on \N{} or unescaped left brace after \N
 
@@ -5223,7 +5223,7 @@ L<perlfunc/setsockopt>.
 
 =item Setting ${^ENCODING} is deprecated
 
-(D deprecated) You assiged a non-C<undef> value to C<${^ENCODING}>.
+(D deprecated) You assigned a non-C<undef> value to C<${^ENCODING}>.
 This is deprecated; see C<L<perlvar/${^ENCODING}>> for details.
 
 =item Setting $/ to a reference to %s as a form of slurp is deprecated, treating as undef
@@ -5440,6 +5440,15 @@ the previous instance.  This is almost always a typographical error.
 Note that the earlier subroutine will still exist until the end of
 the scope or until all closure references to it are destroyed.
 
+=item Subroutine %s redefined
+
+(W redefine) You redefined a subroutine.  To suppress this warning, say
+
+    {
+       no warnings 'redefine';
+       eval "sub name { ... }";
+    }
+
 =item Subroutine "%s" will not stay shared
 
 (W closure) An inner (nested) I<named> subroutine is referencing a "my"
@@ -5459,15 +5468,6 @@ anonymous, using the C<sub {}> syntax.  When inner anonymous subs that
 reference lexical subroutines in outer subroutines are created, they
 are automatically rebound to the current values of such lexical subs.
 
-=item Subroutine %s redefined
-
-(W redefine) You redefined a subroutine.  To suppress this warning, say
-
-    {
-       no warnings 'redefine';
-       eval "sub name { ... }";
-    }
-
 =item Substitution loop
 
 (P) The substitution was looping infinitely.  (Obviously, a substitution