diff options
author | Georg Brandl <georg@python.org> | 2010-12-31 23:00:03 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-12-31 23:00:03 (GMT) |
commit | ed13853e5dd22a85131b34707c6087677eec642a (patch) | |
tree | 7fcc3e7543e674feb982937cacf53ee6746cc6aa /Doc/license.rst | |
parent | 1daaf9e68e52e0c79778e37f395ce686da225385 (diff) | |
download | cpython-ed13853e5dd22a85131b34707c6087677eec642a.zip cpython-ed13853e5dd22a85131b34707c6087677eec642a.tar.gz cpython-ed13853e5dd22a85131b34707c6087677eec642a.tar.bz2 |
Happy New Year! (CET edition)
Diffstat (limited to 'Doc/license.rst')
-rw-r--r-- | Doc/license.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 28033fc..a32b7ab 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -108,7 +108,7 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.1.2 | 3.1 | 2010 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ -| 3.2 | 3.1 | 2010 | PSF | yes | +| 3.2 | 3.1 | 2011 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ .. note:: @@ -138,7 +138,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-2010 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2011 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. @@ -906,7 +906,7 @@ The :mod:`zlib` extension is built using an included copy of the zlib sources unless the zlib version found on the system is too old to be used for the build:: - Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages |