Merge branch 'master' into github

zware · zware · commit f92acf59514d · 2017-01-03T00:52:51.000-06:00
diff --git a/docquality.rst b/docquality.rst
@@ -83,8 +83,8 @@ To clone the Developer's Guide::
 
     $ git clone https://github.com/python/devguide.git
 
-To build the devguide, you must have `Sphinx`_ installed.  The devguide HTML
-can be built by running::
+To build the devguide, you must have the latest stable version of `Sphinx`_
+installed.  The devguide HTML can be built by running::
 
     $ make html
 
diff --git a/documenting.rst b/documenting.rst
@@ -1458,8 +1458,9 @@ To build the documentation, follow the instructions from one of the sections
 below.  You can view the documentation after building the HTML by pointing
 a browser at the file :file:`Doc/build/html/index.html`.
 
-You are expected to have installed a recent version of Sphinx on your system or
-in a virtualenv_, so that the Makefile can find the ``sphinx-build`` command.
+You are expected to have installed the latest stable version of Sphinx_ on
+your system or in a virtualenv_, so that the Makefile can find the
+``sphinx-build`` command.
 
 
 Using make / make.bat
diff --git a/index.rst b/index.rst
@@ -49,9 +49,8 @@ patch:
       ./python -m test -j3
 
    On :ref:`most <mac-python.exe>` Mac OS X systems, replace :file:`./python`
-   with :file:`./python.exe`.  On Windows, use :file:`python.bat` or
-   check the :ref:`Windows instructions <win-python.exe>`.  With Python 2.7,
-   replace ``test`` with ``test.regrtest``.
+   with :file:`./python.exe`.  On Windows, use :file:`python.bat`.  With Python
+   2.7, replace ``test`` with ``test.regrtest``.
 5. Make a :doc:`pull request <pullrequest>`.
 6. Create an issue on the `issue tracker`_ if one does not already exist.
 
@@ -76,9 +75,9 @@ Status of Python branches
 +------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
 | Branch           | Schedule     | Status      | First release  | End-of-life    | Comment                                                                    |
 +==================+==============+=============+================+================+============================================================================+
-| default          | *TBD*        | features    | *TBD*          | *TBD*          | The default branch is currently the future version Python 3.7.             |
+| default          | :pep:`537`   | features    | *2018-06-15*   | *2023-06-15*   | The default branch is currently the future version Python 3.7.             |
 +------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
-| 3.6              | :pep:`494`   | bugfix      | *2016-12-16*   | *2021-12-16*   | For the beta and rc phases of the future 3.6.0, then maintenance for 3.6.x |
+| 3.6              | :pep:`494`   | bugfix      | 2016-12-23     | *2021-12-23*   |                                                                            |
 +------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
 | 3.5              | :pep:`478`   | bugfix      | 2015-09-13     | *2020-09-13*   |                                                                            |
 +------------------+--------------+-------------+----------------+----------------+----------------------------------------------------------------------------+
diff --git a/runtests.rst b/runtests.rst
@@ -21,8 +21,7 @@ from the root directory of your checkout (after you have
 
 You may need to change this command as follows throughout this section.
 On :ref:`most <mac-python.exe>` Mac OS X systems, replace :file:`./python`
-with :file:`./python.exe`.  On Windows, use :file:`PCbuild\\python_d.exe` or
-check the detailed :ref:`Windows instructions <win-python.exe>`.  If using
+with :file:`./python.exe`.  On Windows, use :file:`python.bat`.  If using
 Python 2.7, replace ``test`` with ``test.regrtest``.
 
 If you don't have easy access to a command line, you can run the test suite from
diff --git a/setup.rst b/setup.rst
@@ -273,65 +273,24 @@ still build properly).
 Windows
 '''''''
 
-The `readme <https://github.com/python/cpython/blob/master/PCbuild/readme.txt>`_
-included in the solution has more details, especially on what additional
-software is required to build which parts of Python.
-
 **Python 3.5** and later use Microsoft Visual Studio 2015.  You can download
-and use any of the free or paid versions of `Visual Studio 2015
-<https://www.visualstudio.com/>`_. Installing the latest updates is also
-recommended.
-
-Python 3.3 and 3.4 use Microsoft Visual Studio 2010.  You can download
-Microsoft Visual Studio 2010 Express with an `MSDN subscription
-<https://msdn.microsoft.com/subscriptions/downloads>`_.
-You'll also need to install the Visual Studio `Service Pack 1 (SP1)
-<http://www.microsoft.com/en-us/download/details.aspx?id=23691>`_. If you
-don't install this service pack, you may receive errors like the following
-during linking: ``LINK : fatal error LNK1123: failure during conversion to
-COFF: file invalid or corrupt``.
-
-Most Python versions prior to 3.3 use Microsoft Visual Studio 2008.  You can
-download Microsoft Visual C++ 2008 Express Edition with SP1
-from a new location yet to be determined.
-
-Regardless of Visual Studio version, the ``PCbuild`` directory of a source
-checkout contains the build files for the Python version you are building.
-
-To build from the command line, execute :file:`PCBuild\\build.bat`.  If you
-have not previously done so, you can pass the ``-e`` option to download
-external dependencies or invoke :file:`PCBuild\\get_externals.bat` directly. By
-default, :file:`PCBuild\\build.bat` will produce a 32-bit release build. Pass
-the ``-p x64`` option to produce a 64-bit build, and/or the ``-d`` option to
-produce a debug build.
-
-To build from the Visual Studio GUI, open the ``pcbuild.sln`` solution file
-with Visual Studio.  Choose the :menuselection:`Build Solution` option
-under the :menuselection:`Build` menu.  Be sure that "Debug" was chosen
-as the active solution configuration (e.g. under
-:menuselection:`Build --> Configuration Manager...`).
-
-When building you may see a number of build errors related to missing
-files or directories.  These do not necessarily mean that Python failed
-to build.  If you prefer, you can exclude the offending projects from
-the build process by unchecking them inside the
-:menuselection:`Build --> Configuration Manager...` settings. You can
-also use the script :file:`PCbuild\\get_externals.bat` to download missing
-dependencies.
-
-Once built you might want to set Python as a startup project. Pressing F5 in
-Visual Studio, or choosing :menuselection:`Start Debugging` from the
-:menuselection:`Debug` menu, will launch the interpreter.
-
-.. _win-python.exe:
-
-If you want to launch the compiled interpreter from the command-line, the
-path varies according to the build.  For a 32-bit build in debug mode, you
-have to invoke ``PCBuild\win32\python_d.exe``, for a 64-bit build in debug
-mode, ``PCBuild\amd64\python_d.exe``.  If you are compiling in release mode
-(which you shouldn't, in general), replace ``python_d.exe`` with
-``python.exe``.  You can also invoke the most recently built interpreter using
-``python.bat`` in the root of the source tree.
+and use any of the free or paid versions of `Visual Studio 2015`_. Installing
+the latest updates is also recommended.  See the readme_ for
+more details on what other software is necessary and how to build.
+
+**Python 2.7** uses Microsoft Visual Studio 2008, which is most easily obtained
+through an MSDN subscription.  To use the build files in the `PCbuild
+directory`_ you will also need Visual Studio 2010, see the `2.7 readme`_ for
+more details.  If you have VS 2008 but not 2010 you can use the build files in
+the `PC/VS9.0 directory`_, see the `VS9 readme`_ for details.
+
+.. _Visual Studio 2015: https://www.visualstudio.com/
+.. _readme: https://github.com/python/cpython/blob/master/PCbuild/readme.txt
+.. _PCbuild directory: https://github.com/python/cpython/tree/2.7/PCbuild/
+.. _2.7 readme: https://github.com/python/cpython/blob/2.7/PCbuild/readme.txt
+.. _PC/VS9.0 directory: https://github.com/python/cpython/tree/2.7/PC/VS9.0/
+.. _VS9 readme: https://github.com/python/cpython/blob/2.7/PC/VS9.0/readme.txt
+
 
 .. _build_troubleshooting:
 
