summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-12-31 23:00:03 (GMT)
committerGeorg Brandl <georg@python.org>2010-12-31 23:00:03 (GMT)
commited13853e5dd22a85131b34707c6087677eec642a (patch)
tree7fcc3e7543e674feb982937cacf53ee6746cc6aa /Doc
parent1daaf9e68e52e0c79778e37f395ce686da225385 (diff)
downloadcpython-ed13853e5dd22a85131b34707c6087677eec642a.zip
cpython-ed13853e5dd22a85131b34707c6087677eec642a.tar.gz
cpython-ed13853e5dd22a85131b34707c6087677eec642a.tar.bz2
Happy New Year! (CET edition)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/README.txt2
-rw-r--r--Doc/copyright.rst2
-rw-r--r--Doc/license.rst6
3 files changed, 5 insertions, 5 deletions
diff --git a/Doc/README.txt b/Doc/README.txt
index f3fe9f1..03b1c7f 100644
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -132,7 +132,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-2010 Python Software Foundation.
+Copyright (c) 2000-2011 Python Software Foundation.
All rights reserved.
Copyright (c) 2000 BeOpen.com.
diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index 893b541..ff6b677 100644
--- a/Doc/copyright.rst
+++ b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
-Copyright © 2001-2010 Python Software Foundation. All rights reserved.
+Copyright © 2001-2011 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
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