diff options
| author | Georg Brandl <georg@python.org> | 2010-07-31 09:01:16 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-07-31 09:01:16 (GMT) |
| commit | fff9021f75b21658dab0ab530675c9f54b94db77 (patch) | |
| tree | 468bc366656b09573790f1ef116801cffbd1dbc0 | |
| parent | c049fca0da0b81b04060d52443af493afa560ee8 (diff) | |
| download | cpython-fff9021f75b21658dab0ab530675c9f54b94db77.zip cpython-fff9021f75b21658dab0ab530675c9f54b94db77.tar.gz cpython-fff9021f75b21658dab0ab530675c9f54b94db77.tar.bz2 | |
Update copyright years and add releases to release list. Also update Sphinx version number.
| -rw-r--r-- | Doc/README.txt | 4 | ||||
| -rw-r--r-- | Doc/license.rst | 4 | ||||
| -rw-r--r-- | Doc/make.bat | 2 | ||||
| -rw-r--r-- | LICENSE | 1 | ||||
| -rw-r--r-- | PC/python_nt.rc | 2 | ||||
| -rw-r--r-- | Python/getcopyright.c | 2 |
6 files changed, 10 insertions, 5 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index 7a561c0..463f1db 100644 --- 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 addfe6d..80e31b6 100644 --- 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 45d9d68..22889de 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -34,7 +34,7 @@ echo. 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
@@ -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 e132837..f5fff87 100644 --- 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 a5e7fa6..43a0293 100644 --- 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\ |