merge 3.5

1 files changed, 21 insertions, 21 deletions

diff --git a/README b/README
index 2335889b3a..7afdbf829c 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.5.1
-============================
+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, 2016 Python Software Foundation.  All rights reserved.
@@ -28,9 +28,9 @@ find out more.  On OSX and Cygwin, the executable is called python.exe;
 elsewhere it's just python.
 
 On Mac OS X, if you have configured Python with --enable-framework, you should
-use "make frameworkinstall" to do the installation.  Note that this installs
-the Python executable in a place that is not normally on your PATH, you may
-want to set up a symlink in /usr/local/bin.
+use "make frameworkinstall" to do the installation.  Note that this installs the
+Python executable in a place that is not normally on your PATH, you may want to
+set up a symlink in /usr/local/bin.
 
 On Windows, see PCbuild/readme.txt.
 
@@ -79,9 +79,9 @@ What's New
 ----------
 
 We have a comprehensive overview of the changes in the "What's New in
-Python 3.5" document, found at
+Python 3.6" document, found at
 
-    http://docs.python.org/3.5/whatsnew/3.5.html
+    http://docs.python.org/3.6/whatsnew/3.6.html
 
 For a more detailed change log, read Misc/NEWS (though this file, too,
 is incomplete, and also doesn't list anything merged in from the 2.7
@@ -94,9 +94,9 @@ entitled "Installing multiple versions".
 Documentation
 -------------
 
-Documentation for Python 3.5 is online, updated daily:
+Documentation for Python 3.6 is online, updated daily:
 
-    http://docs.python.org/3.5/
+    http://docs.python.org/3.6/
 
 It can also be downloaded in many formats for faster access.  The documentation
 is downloadable in HTML, PDF, and reStructuredText formats; the latter version
@@ -121,7 +121,7 @@ backported versions of certain key Python 3.x features.
 A source-to-source translation tool, "2to3", can take care of the mundane task
 of converting large amounts of source code.  It is not a complete solution but
 is complemented by the deprecation warnings in 2.6.  See
-http://docs.python.org/3.5/library/2to3.html for more information.
+http://docs.python.org/3.6/library/2to3.html for more information.
 
 
 Testing
@@ -151,16 +151,16 @@ Installing multiple versions
 
 On Unix and Mac systems if you intend to install multiple versions of Python
 using the same installation prefix (--prefix argument to the configure script)
-you must take care that your primary python executable is not overwritten by
-the installation of a different version.  All files and directories installed
-using "make altinstall" contain the major and minor version and can thus live
-side-by-side.  "make install" also creates ${prefix}/bin/python3 which refers
-to ${prefix}/bin/pythonX.Y.  If you intend to install multiple versions using
-the same prefix you must decide which version (if any) is your "primary"
-version.  Install that version using "make install".  Install all other
-versions using "make altinstall".
-
-For example, if you want to install Python 2.6, 2.7 and 3.5 with 2.7 being the
+you must take care that your primary python executable is not overwritten by the
+installation of a different version.  All files and directories installed using
+"make altinstall" contain the major and minor version and can thus live
+side-by-side.  "make install" also creates ${prefix}/bin/python3 which refers to
+${prefix}/bin/pythonX.Y.  If you intend to install multiple versions using the
+same prefix you must decide which version (if any) is your "primary" version.
+Install that version using "make install".  Install all other versions using
+"make altinstall".
+
+For example, if you want to install Python 2.6, 2.7 and 3.6 with 2.7 being the
 primary version, you would execute "make install" in your 2.7 build directory
 and "make altinstall" in the others.
 
@@ -196,7 +196,7 @@ http://www.python.org/dev/peps/.
 Release Schedule
 ----------------
 
-See PEP 478 for release details: http://www.python.org/dev/peps/pep-0478/
+See PEP 494 for release details: http://www.python.org/dev/peps/pep-0494/
 
 
 Copyright and License Information