summaryrefslogtreecommitdiffstats
path: root/Doc/license.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-04 12:16:59 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-04 12:16:59 (GMT)
commitedc3cbaaba1493a00572ad46daaab14e341d738e (patch)
tree5db46d5b6a9e72f641928cf1faf783df1e67b382 /Doc/license.rst
parente800a0e1c2b93f185580ae3926b239e2944b56d9 (diff)
downloadcpython-edc3cbaaba1493a00572ad46daaab14e341d738e.zip
cpython-edc3cbaaba1493a00572ad46daaab14e341d738e.tar.gz
cpython-edc3cbaaba1493a00572ad46daaab14e341d738e.tar.bz2
Copyright year update, add version to licenses.v3.2.6rc1
Diffstat (limited to 'Doc/license.rst')
-rw-r--r--Doc/license.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index a3257f8..32a36b9 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -122,6 +122,10 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 3.2.4 | 3.2.3 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
+| 3.2.5 | 3.2.4 | 2013 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 3.2.6 | 3.2.5 | 2014 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
.. note::
@@ -150,7 +154,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-2013 Python Software Foundation; All Rights
+ copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee.