Author: georg.brandl Date: Sat Jul 31 11:01:16 2010 New Revision: 83320 Log: Update copyright years and add releases to release list. Also update Sphinx version number. Modified: python/branches/py3k/Doc/README.txt python/branches/py3k/Doc/license.rst python/branches/py3k/Doc/make.bat python/branches/py3k/LICENSE python/branches/py3k/PC/python_nt.rc python/branches/py3k/Python/getcopyright.c Modified: python/branches/py3k/Doc/README.txt ============================================================================== --- python/branches/py3k/Doc/README.txt (original) +++ python/branches/py3k/Doc/README.txt Sat Jul 31 11:01:16 2010 @@ -78,7 +78,7 @@ 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 @@ 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. Modified: python/branches/py3k/Doc/license.rst ============================================================================== --- python/branches/py3k/Doc/license.rst (original) +++ python/branches/py3k/Doc/license.rst Sat Jul 31 11:01:16 2010 @@ -106,6 +106,10 @@ +----------------+--------------+------------+------------+-----------------+ | 3.1.1 | 3.1 | 2009 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.1.2 | 3.1 | 2010 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 3.2 | 3.1 | 2010 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ .. note:: Modified: python/branches/py3k/Doc/make.bat ============================================================================== --- python/branches/py3k/Doc/make.bat (original) +++ python/branches/py3k/Doc/make.bat Sat Jul 31 11:01:16 2010 @@ -34,7 +34,7 @@ goto end :checkout -svn co %SVNROOT%/external/Sphinx-0.6.5/sphinx tools/sphinx +svn co %SVNROOT%/external/Sphinx-1.0.1/sphinx tools/sphinx svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2 svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments Modified: python/branches/py3k/LICENSE ============================================================================== --- python/branches/py3k/LICENSE (original) +++ python/branches/py3k/LICENSE Sat Jul 31 11:01:16 2010 @@ -68,6 +68,7 @@ 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: Modified: python/branches/py3k/PC/python_nt.rc ============================================================================== --- python/branches/py3k/PC/python_nt.rc (original) +++ python/branches/py3k/PC/python_nt.rc Sat Jul 31 11:01:16 2010 @@ -61,7 +61,7 @@ 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 Modified: python/branches/py3k/Python/getcopyright.c ============================================================================== --- python/branches/py3k/Python/getcopyright.c (original) +++ python/branches/py3k/Python/getcopyright.c Sat Jul 31 11:01:16 2010 @@ -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\