diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:37:30 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:37:30 -0600 |
| commit | ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09 (patch) | |
| tree | c320e2b4d95c17b703ef6ca9cebbfa54f92c268e | |
| parent | 0485314305b87924205159f47dc25ae330ec5ae5 (diff) | |
| parent | 198399d92c0776248583fcb13670ddc92304512c (diff) | |
| download | cpython-git-ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09.tar.gz | |
merge 3.3
| -rw-r--r-- | Doc/copyright.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 2 | ||||
| -rw-r--r-- | LICENSE | 4 | ||||
| -rw-r--r-- | Python/getcopyright.c | 2 | ||||
| -rw-r--r-- | README | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 9a245c8b72..94f777c4ef 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2012 Python Software Foundation. All rights reserved. +Copyright © 2001-2013 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/license.rst b/Doc/license.rst index e56ca5b2e5..3508d54470 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -152,7 +152,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-2012 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2013 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. @@ -111,8 +111,8 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012 Python Software Foundation; All Rights Reserved" are retained in Python -alone or in any derivative version prepared by Licensee. +2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained +in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make diff --git a/Python/getcopyright.c b/Python/getcopyright.c index d83c6da1a2..2d26787dfb 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static char cprt[] = "\ -Copyright (c) 2001-2012 Python Software Foundation.\n\ +Copyright (c) 2001-2013 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ @@ -2,7 +2,7 @@ This is Python version 3.4.0 prerelease ======================================= Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012 Python Software Foundation. All rights reserved. +2012, 2013 Python Software Foundation. All rights reserved. Python 3.x is a new version of the language, which is incompatible with the 2.x line of releases. The language is mostly the same, but many details, especially |