summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-01-01 16:25:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-01-01 16:25:22 (GMT)
commit71db903563906cedfc098418659d1200043cd14c (patch)
treeff98ce9b9f201d87e9ae7d8ed1aa3492d5a91046
parent288cb25f1a208fe09b9e06ba479e11c1157da4b5 (diff)
parent4c70293755ce8ea0adc5b224c714da2b7625d232 (diff)
downloadcpython-71db903563906cedfc098418659d1200043cd14c.zip
cpython-71db903563906cedfc098418659d1200043cd14c.tar.gz
cpython-71db903563906cedfc098418659d1200043cd14c.tar.bz2
merge 3.5
-rw-r--r--Doc/copyright.rst2
-rw-r--r--Doc/license.rst6
-rw-r--r--LICENSE2
-rw-r--r--PC/python_ver_rc.h2
-rw-r--r--Python/getcopyright.c2
-rw-r--r--README2
6 files changed, 8 insertions, 8 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst
index 2b2f887..22d7705 100644
--- a/Doc/copyright.rst
+++ b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
-Copyright © 2001-2015 Python Software Foundation. All rights reserved.
+Copyright © 2001-2016 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
diff --git a/Doc/license.rst b/Doc/license.rst
index 53a1c4d..8a613b2 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-2015 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-2016 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/LICENSE b/LICENSE
index 88251f5..a1ea80d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -74,7 +74,7 @@ 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, 2015 Python Software Foundation; All Rights Reserved"
+2011, 2012, 2013, 2014, 2015,2016 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
diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h
index 827e9be..8ad18ef 100644
--- a/PC/python_ver_rc.h
+++ b/PC/python_ver_rc.h
@@ -4,7 +4,7 @@
#include "winver.h"
#define PYTHON_COMPANY "Python Software Foundation"
-#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2015 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
+#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2016 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
#define MS_WINDOWS
#include "modsupport.h"
diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index 2ad2848..c3f1e89 100644
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -4,7 +4,7 @@
static const char cprt[] =
"\
-Copyright (c) 2001-2015 Python Software Foundation.\n\
+Copyright (c) 2001-2016 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\
diff --git a/README b/README
index d682a2b..7afdbf8 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ This is Python version 3.6.0 alpha 1
====================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
+2012, 2013, 2014, 2015, 2016 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,