Merge branch 'blead' of ssh://perl5.git.perl.org/perl into blead

5 files changed, 27 insertions, 31 deletions

diff --git a/pod/perl5110delta.pod b/pod/perl5110delta.pod
index b4c2cdcf83..c7cb8ae8d6 100644
--- a/pod/perl5110delta.pod
+++ b/pod/perl5110delta.pod
@@ -156,6 +156,12 @@ L<TAP::Harness> needs to be able to schedule individual non-conflicting test
 scripts itself, and there is no standard interface to C<make> utilities to
 interact with their job schedulers.
 
+=head2 The C<...> operator
+
+A new operator, C<...>, nicknamed the Yada Yada operator, has been added.
+It is intended to mark placeholder code, that is not yet implemented.
+See L<perlop/"Yada Yada Operator">. (chromatic)
+
 =head1 Modules and Pragmata
 
 =head2 Pragmata Changes
diff --git a/pod/perldata.pod b/pod/perldata.pod
index 8f0feb7fed..3c1a95e2c4 100644
--- a/pod/perldata.pod
+++ b/pod/perldata.pod
@@ -371,11 +371,6 @@ equivalent to C<$version{2}++>, not to C<$version{'2.0'}++>.
 =head3 Version Strings
 X<version string> X<vstring> X<v-string>
 
-B<Note:> Version Strings (v-strings) have been deprecated.  They will
-be removed in some future release after Perl 5.8.1.  The marginal
-benefits of v-strings were greatly outweighed by the potential for
-Surprise and Confusion.
-
 A literal of the form C<v1.20.300.4000> is parsed as a string composed
 of characters with the specified ordinals.  This form, known as
 v-strings, provides an alternative, more readable way to construct
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 9d58104ab8..1775163cf7 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -316,8 +316,8 @@ release of Perl 5.
 =item Attribute "unique" is deprecated
 
 (D deprecated) You have used the attributes pragam to modify the "unique"
-attribute on a array, hash or scalar reference. The :unique attribute is has
-had no no effect since Perl 5.8.8, and will be removed in the next major
+attribute on an array, hash or scalar reference. The :unique attribute has
+had no effect since Perl 5.8.8, and will be removed in the next major
 release of Perl 5.
 
 =item Bad arg length for %s, is %d, should be %d
diff --git a/pod/perlop.pod b/pod/perlop.pod
index e6774303ee..23f62e09ab 100644
--- a/pod/perlop.pod
+++ b/pod/perlop.pod
@@ -813,14 +813,11 @@ between keys and values in hashes, and other paired elements in lists.
         %hash = ( $key => $value );
         login( $username => $password );
 
-=head2 Yada Yada Operators
-X<...> X<... operator> X<!!!> X<!!! operator> X<???> X<??? operator>
-X<yada yada operator>
+=head2 Yada Yada Operator
+X<...> X<... operator> X<yada yada operator>
 
-The yada yada operators are placeholders for code.  They parse without error,
-but when executed either throw an exception or a warning.
-
-The C<...> operator takes no arguments.  When executed, it throws an exception
+The yada yada operator (noted C<...>) is a placeholder for code.
+It parses without error, but when executed it throws an exception
 with the text C<Unimplemented>:
 
     sub foo { ... }
@@ -828,23 +825,7 @@ with the text C<Unimplemented>:
 
     Unimplemented at <file> line <line number>.
 
-The C<!!!> operator is similar, but it takes one argument, a string to use as
-the text of the exception:
-
-    sub bar { !!! "Don't call me, Ishmael!" }
-    bar();
-
-    Don't call me, Ishmael! at <file> line <line number>.
-
-The C<???> operator also takes one argument, but it emits a warning instead of
-throwing an exception:
-
-    sub baz { ??? "Who are you?  What do you want?" }
-    baz();
-    say "Why are you here?";
-
-    Who are you?  What do you want? at <file> line <line number>.
-    Why are you here?
+It takes no argument.
 
 =head2 List Operators (Rightward)
 X<operator, list, rightward> X<list operator>
diff --git a/pod/perltodo.pod b/pod/perltodo.pod
index c84b51e368..06b5c771e0 100644
--- a/pod/perltodo.pod
+++ b/pod/perltodo.pod
@@ -804,6 +804,20 @@ also the warning messages (see L<perllexwarn>, C<warnings.pl>).
 These tasks would need C knowledge, and knowledge of how the interpreter works,
 or a willingness to learn.
 
+=head2 forbid labels with keyword names
+
+Currently C<goto keyword> "computes" the label value:
+
+    $ perl -e 'goto print'
+    Can't find label 1 at -e line 1.
+
+It would be nice to forbid labels with keyword names, to avoid confusion.
+
+=head2 truncate() prototype
+
+The prototype of truncate() is currently C<$$>. It should probably
+be C<*$> instead. (This is changed in F<opcode.pl>)
+
 =head2 error reporting of [$a ; $b]
 
 Using C<;> inside brackets is a syntax error, and we don't propose to change