From 1981f8141bdcf43369a4c3e5fd107c2255a35006 Mon Sep 17 00:00:00 2001
From: Steve Hay <steve.m.hay@googlemail.com>
Date: Wed, 16 Oct 2013 17:55:51 +0100
Subject: [PATCH] perldelta - Fix up attributes addition, and add new warnings

---
 pod/perldelta.pod | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 4de3045..e3563ea 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -61,10 +61,11 @@ perlref|perlref/Postfix Dereference Syntax>.
 
 =head2 C<sub>s now take a C<prototype> attribute
 
-When declaring or defining a C<sub>, the prototype can now be specified
-inside of a C<prototype> attribute instead of in parens following the name.
+When declaring or defining a C<sub>, the prototype can now be specified inside
+of a C<prototype> attribute instead of in parens following the name.
 
-For example, C<sub foo($$){}> could be rewritten as C<sub foo : prototype($$){}>
+For example, C<sub foo($$){}> could be rewritten as
+C<sub foo : prototype($$){}>.
 
 =head1 Security
 
@@ -165,6 +166,12 @@ XXX
 
 =item *
 
+L<attributes> has been upgraded from version 0.21 to 0.22.
+
+Support has been added for the C<prototype> attribute.
+
+=item *
+
 L<autodie> has been upgraded from version 2.21 to 2.22.
 
 No changes have been made to the installed code other than the version bump to
@@ -322,12 +329,6 @@ L<warnings> has been upgraded from version 1.19 to 1.20.
 
 The new warnings category C<experimental::postderef> has been added.
 
-=item *
-
-L<attributes> has been upgraded from version 0.21 to 0.22
-
-Added support for the C<prototype> attribute.
-
 =back
 
 =head2 Removed Modules and Pragmata
@@ -421,6 +422,14 @@ XXX L<message|perldiag/"message">
 
 =item *
 
+L<Attribute prototype(%s) discards earlier prototype attribute in same sub|perldiag/"Attribute prototype(%s) discards earlier prototype attribute in same sub">
+
+(W misc) A sub was declared as sub foo : prototype(A) : prototype(B) {}, for
+example.  Since each sub can only have one prototype, the earlier
+declaration(s) are discarded while the last one is applied.
+
+=item *
+
 L<Postfix dereference is experimental|perldiag/"Postfix dereference is experimental">
 
 (S experimental::postderef) This warning is emitted if you use the experimental
@@ -435,6 +444,15 @@ experimental feature which may change or be removed in a future Perl version:
     $aref->@[@indices];
     ... etc ...
 
+=item *
+
+L<Prototype '%s' overridden by attribute 'prototype(%s)' in %s|perldiag/"Prototype '%s' overridden by attribute 'prototype(%s)' in %s">
+
+(W prototype) A prototype was declared in both the parentheses after the sub
+name and via the prototype attribute.  The prototype in parentheses is useless,
+since it will be replaced by the prototype from the attribute before it's ever
+used.
+
 =back
 
 =head2 Changes to Existing Diagnostics
-- 
2.7.4