diff options
author | Barry Warsaw <barry@python.org> | 2012-02-23 10:59:38 -0500 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2012-02-23 10:59:38 -0500 |
commit | 74f4bd53e03ded8408bcc2de67cf0f5a4ac5b1a1 (patch) | |
tree | 1bb11240118a8b1c2644d5823d580301777aae7a | |
parent | Bump to version 2.6.8rc1. (diff) | |
download | cpython-74f4bd53e03ded8408bcc2de67cf0f5a4ac5b1a1.tar.gz cpython-74f4bd53e03ded8408bcc2de67cf0f5a4ac5b1a1.tar.bz2 cpython-74f4bd53e03ded8408bcc2de67cf0f5a4ac5b1a1.zip |
Bump some more copyright years (as per PEP 101), since this is the firstv2.6.8rc1
release of 2.6 for 2012.
-rw-r--r-- | Doc/README.txt | 2 | ||||
-rw-r--r-- | Doc/copyright.rst | 2 | ||||
-rw-r--r-- | Doc/license.rst | 2 | ||||
-rw-r--r-- | LICENSE | 1 | ||||
-rw-r--r-- | PC/python_nt.rc | 2 | ||||
-rw-r--r-- | Python/getcopyright.c | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index ef1c1f72934..22da427c101 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -127,7 +127,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-2011 Python Software Foundation. +Copyright (c) 2000-2012 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. diff --git a/Doc/copyright.rst b/Doc/copyright.rst index ff6b6772523..9a245c8b723 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2011 Python Software Foundation. All rights reserved. +Copyright © 2001-2012 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index 374ee15d215..a38a167cdeb 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -108,6 +108,8 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+-----------+------------+-----------------+ | 2.6.7 | 2.6.6 | 2011 | PSF | yes | +----------------+--------------+-----------+------------+-----------------+ +| 2.6.8 | 2.6.7 | 2012 | PSF | yes | ++----------------+--------------+-----------+------------+-----------------+ .. note:: @@ -65,6 +65,7 @@ the various releases. 2.6.5 2.6.4 2010 PSF yes 2.6.6 2.6.5 2010 PSF yes 2.6.7 2.6.6 2011 PSF yes + 2.6.8 2.6.7 2012 PSF yes Footnotes: diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 8cccf2dc2ae..5295610ae17 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-2011 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 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 824c7b1c827..d91a879ae38 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static char cprt[] = "\ -Copyright (c) 2001-2011 Python Software Foundation.\n\ +Copyright (c) 2001-2012 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ |