aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-03-15 22:43:17 -0700
committerLarry Hastings <larry@hastings.org>2014-03-15 22:43:17 -0700
commit3101b7076270756f8be699358c69c5d15ea2cc48 (patch)
tree679a61543fa98d12e2de79278226b94dca2fded4
parentRelease bump for 3.4.0 final. (diff)
downloadcpython-3101b7076270756f8be699358c69c5d15ea2cc48.tar.gz
cpython-3101b7076270756f8be699358c69c5d15ea2cc48.tar.bz2
cpython-3101b7076270756f8be699358c69c5d15ea2cc48.zip
Final documentation fixes for 3.4.0 final.v3.4.0
-rw-r--r--Doc/license.rst6
-rw-r--r--Doc/whatsnew/3.4.rst5
-rw-r--r--LICENSE4
3 files changed, 6 insertions, 9 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 08e5464769d..6190fe02d4c 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-2014 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-2014 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
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index a4f6cb3d08b..1b751b04979 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -61,10 +61,7 @@
while :ref:`~mod.attr` will display as ``attr``.
This article explains the new features in Python 3.4, compared to 3.3.
-
-.. Python 3.4 was released on TBD.
-
-For full details, see the
+Python 3.4 was released on March 16, 2014. For full details, see the
`changelog <http://docs.python.org/3.4/whatsnew/changelog.html>`_.
diff --git a/LICENSE b/LICENSE
index f9ca2c987c2..583f9f6e617 100644
--- a/LICENSE
+++ b/LICENSE
@@ -74,8 +74,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, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained
-in Python alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013, 2014 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