[Python-checkins] peps (merge default -> default): Merge

[donald.stufft]

http://hg.python.org/peps/rev/1c946bfa6095
changeset:   5425:1c946bfa6095
parent:      5424:825f56e02158
parent:      5423:2c2175cddef4
user:        Donald Stufft <donald at stufft.io>
date:        Sun Mar 23 13:19:55 2014 -0400
summary:
  Merge

files:
  pep-0101.txt |  12 ++++++++----
  1 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -245,11 +245,15 @@
           ___ Move any historical "what's new" entries from Misc/NEWS to
               Misc/HISTORY.
 
-          ___ Doc/tutorial/interpreter.rst (2 references to '[Pp]ython32', one
-              to 'Python 3.2', also make the date in the banner consistent).
+          ___ Edit Doc/tutorial/interpreter.rst (2 references to '[Pp]ython3x',
+              one to 'Python 3.x', also make the date in the banner consistent).
 
-          ___ Doc/tutorial/stdlib.rst and Doc/tutorial/stdlib2.rst, which have
-              each one reference to '[Pp]ython32'.
+          ___ Edit Doc/tutorial/stdlib.rst and Doc/tutorial/stdlib2.rst, which
+              have each one reference to '[Pp]ython3x'.
+
+          ___ Add a new whatsnew/3.x.rst file (with the comment near the top
+              and the toplevel sections copied from the previous file) and
+              and add it to the toctree in whatsnew/index.rst.
 
           ___ Update the version number in configure.ac and re-run autoconf.
 

-- 
Repository URL: http://hg.python.org/peps