Update copyright years and add releases to release list. Also update Sphinx version...

diff --git a/Doc/README.txt b/Doc/README.txt
index 7a561c0d84d620f8bd3afe95e048d76480521eb4..463f1dbf9097eac711d76086e35cf66f031e120f 100644 (file)
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -78,7 +78,7 @@ Without make
 
 You'll need to install the Sphinx package, either by checking it out via ::
 
-   svn co http://svn.python.org/projects/external/Sphinx-0.6.5/sphinx tools/sphinx
+   svn co http://svn.python.org/projects/external/Sphinx-1.0.1/sphinx tools/sphinx
 
 or by installing it from PyPI.
 
@@ -132,7 +132,7 @@ The Python source is copyrighted, but you can freely use and copy it
 as long as you don't change or remove the copyright notice:
 
 ----------------------------------------------------------------------
-Copyright (c) 2000-2008 Python Software Foundation.
+Copyright (c) 2000-2010 Python Software Foundation.
 All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.

diff --git a/Doc/license.rst b/Doc/license.rst
index addfe6d28ef9aaa29e3b64decb936720b1d217c1..80e31b60440cee09ba0bec2328f9600ae2649371 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -106,6 +106,10 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+------------+------------+-----------------+
 | 3.1.1          | 3.1          | 2009       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
+| 3.1.2          | 3.1          | 2010       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
+| 3.2            | 3.1          | 2010       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
 
 .. note::
 

diff --git a/Doc/make.bat b/Doc/make.bat
index 45d9d6834abe9b0965a2040d5751f4c25cdfdfad..22889dec82be55db5bb7d098eac04f4f3e623fa1 100644 (file)
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -34,7 +34,7 @@ echo.
 goto end\r
 \r
 :checkout\r
-svn co %SVNROOT%/external/Sphinx-0.6.5/sphinx tools/sphinx\r
+svn co %SVNROOT%/external/Sphinx-1.0.1/sphinx tools/sphinx\r
 svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils\r
 svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2\r
 svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments\r

diff --git a/LICENSE b/LICENSE
index 0d336624f4dbc167a7e89acf5cab7b0daaf451a0..c31ac56d772f7061c8b42f0ee96063b7a94a4859 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -68,6 +68,7 @@ the various releases.
     3.1             3.0.1       2009        PSF         yes
     3.1.1           3.1         2009        PSF         yes
     3.1.2           3.1         2010        PSF         yes
+    3.2             3.1         2010        PSF         yes
 
 Footnotes:
 

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index e132837583fdefee30138d7eea992e3ee7ef534f..f5fff8720a957007c92773cd414ccd8d83001907 100644 (file)
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -61,7 +61,7 @@ BEGIN
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
-            VALUE "LegalCopyright", "Copyright © 2001-2008 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
+            VALUE "LegalCopyright", "Copyright © 2001-2010 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION

diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index a5e7fa6396e99e0cbad494d63aea4931eecf444b..43a02938853c04436aebe1e9f68c3f23cafcdbbe 100644 (file)
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -2,7 +2,7 @@
 
 #include "Python.h"
 
-static char cprt[] = 
+static char cprt[] =
 "\
 Copyright (c) 2001-2010 Python Software Foundation.\n\
 All Rights Reserved.\n\