Merged upstream changes.

Doc/whatsnew/2.6.rst

@@ -7,8 +7,6 @@
 .. XXX add trademark info for Apple, Microsoft, SourceForge.
 
 :Author: A.M. Kuchling (amk at amk.ca)
-:Release: |release|
-:Date: |today|
 
 .. $Id$
    Rules for maintenance:

Doc/whatsnew/2.7.rst

@@ -3,8 +3,6 @@
 ****************************
 
 :Author: A.M. Kuchling (amk at amk.ca)
-:Release: |release|
-:Date: |today|
 
 ..  hyperlink all the methods & functions.
 

Doc/whatsnew/3.0.rst

@@ -5,8 +5,6 @@
 .. XXX Add trademark info for Apple, Microsoft.
 
 :Author: Guido van Rossum
-:Release: |release|
-:Date: |today|
 
 .. $Id$
    Rules for maintenance:

Doc/whatsnew/3.1.rst

@@ -3,8 +3,6 @@
 ****************************
 
 :Author: Raymond Hettinger
-:Release: |release|
-:Date: |today|
 
 .. $Id$
    Rules for maintenance:

Doc/whatsnew/3.2.rst

@@ -3,8 +3,6 @@
 ****************************
 
 :Author: Raymond Hettinger
-:Release: |release|
-:Date: |today|
 
 .. $Id$
    Rules for maintenance:

Doc/whatsnew/3.3.rst

@@ -2,9 +2,6 @@
   What's New In Python 3.3
 ****************************
 
-:Release: |release|
-:Date: |today|
-
 .. Rules for maintenance:
 
    * Anyone can add text to this document.  Do not spend very much time

Doc/whatsnew/3.4.rst

@@ -2,8 +2,8 @@
   What's New In Python 3.4
 ****************************
 
-:Release: |release|
-:Date: |today|
+.. :Author: Someone <email>
+   (uncomment if there is a principal author)
 
 .. Rules for maintenance: