summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-10-28 12:37:05 (GMT)
committerGeorg Brandl <georg@python.org>2012-10-28 12:37:05 (GMT)
commit6a935d9230f5153697a5676a039c1af905617858 (patch)
tree3e2703ef6b9bc5db333a63e01782a68da00bc354
parent21b102481bd1b261fe6a5351fc959a6a978a094f (diff)
parent75f0020d29a1a9ea6b06dc125fb3e023655a21bb (diff)
downloadcpython-6a935d9230f5153697a5676a039c1af905617858.zip
cpython-6a935d9230f5153697a5676a039c1af905617858.tar.gz
cpython-6a935d9230f5153697a5676a039c1af905617858.tar.bz2
merge heads
-rw-r--r--Doc/whatsnew/2.6.rst2
-rw-r--r--Doc/whatsnew/2.7.rst2
-rw-r--r--Doc/whatsnew/3.0.rst2
-rw-r--r--Doc/whatsnew/3.1.rst2
-rw-r--r--Doc/whatsnew/3.2.rst2
5 files changed, 0 insertions, 10 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index a84bc19..bdd7ff7 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/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:
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 2e90f96..b26c9b2 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/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.
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 9f1ec97..133ecab 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/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:
diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst
index 64ae1c1..ab327f5 100644
--- a/Doc/whatsnew/3.1.rst
+++ b/Doc/whatsnew/3.1.rst
@@ -3,8 +3,6 @@
****************************
:Author: Raymond Hettinger
-:Release: |release|
-:Date: |today|
.. $Id$
Rules for maintenance:
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 0553ec3..09640f6 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -3,8 +3,6 @@
****************************
:Author: Raymond Hettinger
-:Release: |release|
-:Date: |today|
.. $Id$
Rules for maintenance: