More version bumping to 3.6.

With the creation of the 3.5 branch earlier in the process,
it is necessary to do some of the version bumps now rather than at
final release time (for example, the equivalent of the 3.4->3.5 bumps
in f2bf12fa22c1).  (Some of those changes have already been made, for
example in 30f5e7ec6afe.)

diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index d5789a62c90e36f1e3dabf1ae5cf599a0985435c..db0be32655376a6580f3888ffc0359c2ccca7871 100644 (file)
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -1,4 +1,4 @@
-.. _tut-using:
+3.6.. _tut-using:
 
 ****************************
 Using the Python Interpreter
@@ -10,13 +10,13 @@ Using the Python Interpreter
 Invoking the Interpreter
 ========================
 
-The Python interpreter is usually installed as :file:`/usr/local/bin/python3.5`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python3.6`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
 Unix shell's search path makes it possible to start it by typing the command:
 
 .. code-block:: text
 
-   python3.5
+   python3.6
 
 to the shell. [#]_ Since the choice of the directory where the interpreter lives
 is an installation option, other places are possible; check with your local
@@ -24,11 +24,11 @@ Python guru or system administrator.  (E.g., :file:`/usr/local/python` is a
 popular alternative location.)
 
 On Windows machines, the Python installation is usually placed in
-:file:`C:\\Python35`, though you can change this when you're running the
+:file:`C:\\Python36`, though you can change this when you're running the
 installer.  To add this directory to your path,  you can type the following
 command into the command prompt in a DOS box::
 
-   set path=%path%;C:\python35
+   set path=%path%;C:\python36
 
 Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
 Windows) at the primary prompt causes the interpreter to exit with a zero exit
@@ -96,8 +96,8 @@ with the *secondary prompt*, by default three dots (``...``). The interpreter
 prints a welcome message stating its version number and a copyright notice
 before printing the first prompt::
 
-   $ python3.5
-   Python 3.5 (default, Sep 16 2015, 09:25:04)
+   $ python3.6
+   Python 3.6 (default, Sep 16 2015, 09:25:04)
    [GCC 4.8.2] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>>

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 598859de6a56ad6bf2860ada82e9e14571a2f16b..405d7996edf5fcc3c39d795a42d65d293be4e28c 100644 (file)
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -15,7 +15,7 @@ operating system::
 
    >>> import os
    >>> os.getcwd()      # Return the current working directory
-   'C:\\Python35'
+   'C:\\Python36'
    >>> os.chdir('/server/accesslogs')   # Change current working directory
    >>> os.system('mkdir today')   # Run the command mkdir in the system shell
    0

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index f7d2a0ac2aa59a955c26575bcd6977a985c2d48f..71194b04769fb5a5a4475c10fec97ef01f52bf2a 100644 (file)
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -277,7 +277,7 @@ applications include caching objects that are expensive to create::
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
        d['primary']                # entry was automatically removed
-     File "C:/python35/lib/weakref.py", line 46, in __getitem__
+     File "C:/python36/lib/weakref.py", line 46, in __getitem__
        o = self.data[key]()
    KeyError: 'primary'
 

diff --git a/README b/README
index 87430b79dc0dd9667af645e38dbadf862e94b65a..04c282ebe7eba33ad0bfcd0729f5ece7ff82ea2d 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.5.0 beta 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 Python Software Foundation.  All rights reserved.
@@ -50,9 +50,9 @@ What's New
 ----------
 
 We try to 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 release under
@@ -65,9 +65,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
@@ -92,7 +92,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
@@ -130,7 +130,7 @@ 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
+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.