In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/8165798cc711507af4bd58859dae1d19860215fe?hp=a1b6998077ae2b109cc93651b33f30c38a068f9e>
- Log -----------------------------------------------------------------
commit 8165798cc711507af4bd58859dae1d19860215fe
Author: Matthew Horsfall <wolfs...@gmail.com>
Date: Fri Jun 17 12:52:30 2016 -0400
Some perldelta updates for the upcoming release.
-----------------------------------------------------------------------
Summary of changes:
pod/perldelta.pod | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 8ec4faa..f2457e2 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -203,6 +203,16 @@ XXX Description of the change here
=back
+=head3 L<perllocale>
+
+=over 4
+
+=item *
+
+Document NUL collation handling.
+
+=back
+
=head1 Diagnostics
The following additions or changes have been made to diagnostic output,
@@ -225,6 +235,30 @@ and New Warnings
L<Version control conflict marker|perldiag/"Version control conflict marker">
+(F) The parser found a line starting with C<E<lt><<<<<<>,
+C<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>>, or C<=======>. These may be left by a
+version control system to mark conflicts after a failed merge operation.
+
+=item *
+
+L<%s: command not found|perldiag/"%s: command not found">
+
+(A) You've accidentally run your script through B<bash> or another shell
+instead of Perl. Check the #! line, or manually feed your script into
+Perl yourself. The #! line at the top of your file could look like
+
+ #!/usr/bin/perl
+
+=item *
+
+L<%s: command not found: %s|perldiag/"%s: command not found: %s">
+
+(A) You've accidentally run your script through B<zsh> or another shell
+instead of Perl. Check the #! line, or manually feed your script into
+Perl yourself. The #! line at the top of your file could look like
+
+ #!/usr/bin/perl
+
=item *
XXX L<message|perldiag/"message">
--
Perl5 Master Repository
