diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:25:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-01-01 16:25:12 (GMT) |
| commit | 4c70293755ce8ea0adc5b224c714da2b7625d232 (patch) | |
| tree | 0de9b5bf2f7dd0132d08bfa1fb6216ea9647d814 /Doc | |
| parent | 42bf8fc90158072ff0136a7c8bfa0b0dba3a70d6 (diff) | |
| parent | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 (diff) | |
| download | cpython-4c70293755ce8ea0adc5b224c714da2b7625d232.zip cpython-4c70293755ce8ea0adc5b224c714da2b7625d232.tar.gz cpython-4c70293755ce8ea0adc5b224c714da2b7625d232.tar.bz2 | |
merge 3.4
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 |