diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-01-01 04:43:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-01-01 04:43:01 (GMT) |
| commit | a174577f55634c4de63204b03c0ebcde131cda28 (patch) | |
| tree | cf095587a263c5f163bad07ce3b208f9f178065f /Doc | |
| parent | 8df168cc7b2798786514a97396da57d334c90f70 (diff) | |
| parent | c40d362a1cd6c36635e91b6c7e7dbf3337b55562 (diff) | |
| download | cpython-a174577f55634c4de63204b03c0ebcde131cda28.zip cpython-a174577f55634c4de63204b03c0ebcde131cda28.tar.gz cpython-a174577f55634c4de63204b03c0ebcde131cda28.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/README.txt | 2 | ||||
| -rw-r--r-- | Doc/copyright.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index 50c199e..f296423 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -135,7 +135,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 ff6b677..9a245c8 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 5050ff0..6f63ed4 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -148,7 +148,7 @@ Terms and conditions for accessing or otherwise using Python analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2011 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2012 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. |