diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:24:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:24:21 (GMT) |
| commit | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 (patch) | |
| tree | c36a10e89151a09d87975daea55bae1f358b1377 /Doc | |
| parent | 52d6c2c4c07e3e850db8cf6574619c8f24a0fb39 (diff) | |
| parent | 75e3630c6071819d3674d956ea754ccb4fed5271 (diff) | |
| download | cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.zip cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.tar.gz cpython-e8c2a957c87980a1fd79c39597d40e5c5aeb7048.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/copyright.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 2b2f887..22d7705 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2015 Python Software Foundation. All rights reserved. +Copyright © 2001-2016 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index 53a1c4d..8a613b2 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -84,9 +84,9 @@ 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-2015 Python Software Foundation; All - Rights Reserved" are retained in Python |release| alone or in any derivative - version prepared by Licensee. + copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights + Reserved" are retained in Python |release| alone or in any derivative version + prepared by Licensee. #. In the event Licensee prepares a derivative work that is based on or incorporates Python |release| or any part thereof, and wants to make the |