Reverting my previous commit.

Something went horribly wrong when I was doing `hg rebase`.

5 files changed, 9 insertions, 176 deletions

diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index db0be32..d5789a6 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -1,4 +1,4 @@
-3.6.. _tut-using:
+.. _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.6`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python3.5`
 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.6
+   python3.5
 
 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:\\Python36`, though you can change this when you're running the
+:file:`C:\\Python35`, 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:\python36
+   set path=%path%;C:\python35
 
 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.6
-   Python 3.6 (default, Sep 16 2015, 09:25:04)
+   $ python3.5
+   Python 3.5 (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 405d799..598859d 100644
--- 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:\\Python36'
+   'C:\\Python35'
    >>> 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 71194b0..f7d2a0a 100644
--- 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:/python36/lib/weakref.py", line 46, in __getitem__
+     File "C:/python35/lib/weakref.py", line 46, in __getitem__
        o = self.data[key]()
    KeyError: 'primary'
 
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
deleted file mode 100644
index 375d94e..0000000
--- a/Doc/whatsnew/3.6.rst
+++ /dev/null
@@ -1,166 +0,0 @@
-****************************
-  What's New In Python 3.6
-****************************
-
-:Release: |release|
-:Date: |today|
-
-.. Rules for maintenance:
-
-   * Anyone can add text to this document.  Do not spend very much time
-   on the wording of your changes, because your text will probably
-   get rewritten to some degree.
-
-   * The maintainer will go through Misc/NEWS periodically and add
-   changes; it's therefore more important to add your changes to
-   Misc/NEWS than to this file.
-
-   * This is not a complete list of every single change; completeness
-   is the purpose of Misc/NEWS.  Some changes I consider too small
-   or esoteric to include.  If such a change is added to the text,
-   I'll just remove it.  (This is another reason you shouldn't spend
-   too much time on writing your addition.)
-
-   * If you want to draw your new text to the attention of the
-   maintainer, add 'XXX' to the beginning of the paragraph or
-   section.
-
-   * It's OK to just add a fragmentary note about a change.  For
-   example: "XXX Describe the transmogrify() function added to the
-   socket module."  The maintainer will research the change and
-   write the necessary text.
-
-   * You can comment out your additions if you like, but it's not
-   necessary (especially when a final release is some months away).
-
-   * Credit the author of a patch or bugfix.   Just the name is
-   sufficient; the e-mail address isn't necessary.
-
-   * It's helpful to add the bug/patch number as a comment:
-
-   XXX Describe the transmogrify() function added to the socket
-   module.
-   (Contributed by P.Y. Developer in :issue:`12345`.)
-
-   This saves the maintainer the effort of going through the Mercurial log
-   when researching a change.
-
-This article explains the new features in Python 3.6, compared to 3.5.
-
-For full details, see the :source:`Misc/NEWS` file.
-
-.. note::
-
-   Prerelease users should be aware that this document is currently in draft
-   form. It will be updated substantially as Python 3.6 moves towards release,
-   so it's worth checking back even after reading earlier versions.
-
-
-Summary -- Release highlights
-=============================
-
-.. This section singles out the most important changes in Python 3.6.
-   Brevity is key.
-
-* None yet.
-
-.. PEP-sized items next.
-
-.. _pep-4XX:
-
-.. PEP 4XX: Virtual Environments
-.. =============================
-
-
-.. (Implemented by Foo Bar.)
-
-.. .. seealso::
-
-    :pep:`4XX` - Python Virtual Environments
-       PEP written by Carl Meyer
-
-
-Other Language Changes
-======================
-
-* None yet.
-
-
-New Modules
-===========
-
-* None yet.
-
-
-Improved Modules
-================
-
-* None yet.
-
-
-Optimizations
-=============
-
-* None yet.
-
-
-Build and C API Changes
-=======================
-
-* None yet.
-
-
-Deprecated
-==========
-
-New Keywords
-------------
-
-``async`` and ``await`` are not recommended to be used as variable, class or
-function names.  Introduced by :pep:`492` in Python 3.5, they will become
-proper keywords in Python 3.7.
-
-
-Deprecated Python modules, functions and methods
-------------------------------------------------
-
-* None yet.
-
-
-Deprecated functions and types of the C API
--------------------------------------------
-
-* None yet.
-
-
-Deprecated features
--------------------
-
-* None yet.
-
-
-Removed
-=======
-
-API and Feature Removals
-------------------------
-
-* None yet.
-
-
-Porting to Python 3.6
-=====================
-
-This section lists previously described changes and other bugfixes
-that may require changes to your code.
-
-Changes in the Python API
--------------------------
-
-* None yet.
-
-
-Changes in the C API
---------------------
-
-* None yet.
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
index 7c92524..edb5502 100644
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -11,7 +11,6 @@ anyone wishing to stay up-to-date after a new release.
 .. toctree::
    :maxdepth: 2
 
-   3.6.rst
    3.5.rst
    3.4.rst
    3.3.rst