[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

Wed Nov 4 01:44:10 EST 2015

https://hg.python.org/cpython/rev/eafd2bc7edde
changeset: 98953:eafd2bc7edde
parent: 98948:aba28afc5732
parent: 98952:34864daee5f1
user: Benjamin Peterson <benjamin at python.org>
date: Tue Nov 03 22:42:42 2015 -0800
summary:
 merge 3.5
files:
 Doc/distutils/index.rst | 7 +++----
 Doc/install/index.rst | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst
--- a/Doc/distutils/index.rst
+++ b/Doc/distutils/index.rst
@@ -15,10 +15,9 @@
 .. note::
 
 This guide only covers the basic tools for building and distributing
- extensions that are provided as part of this version of Python. Third
- party tools offer easier to use and more secure alternatives. Refer to the
- `quick recommendations section
- <https://python-packaging-user-guide.readthedocs.org/en/latest/current.html>`__
+ extensions that are provided as part of this version of Python. Third party
+ tools offer easier to use and more secure alternatives. Refer to the `quick
+ recommendations section <https://packaging.python.org/en/latest/current/>`__
 in the Python Packaging User Guide for more information.
 
 
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -27,17 +27,17 @@
 
 
 .. note::
-
- This guide only covers the basic tools for installing extensions that are
- provided as part of this version of Python. Third party tools offer easier
- to use and more secure alternatives. Refer to the
- `quick recommendations section
- <https://python-packaging-user-guide.readthedocs.org/en/latest/current.html>`__
+ 
+ This guide only covers the basic tools for building and distributing
+ extensions that are provided as part of this version of Python. Third party
+ tools offer easier to use and more secure alternatives. Refer to the `quick
+ recommendations section <https://packaging.python.org/en/latest/current/>`__
 in the Python Packaging User Guide for more information.
 
 
 .. _inst-intro:
 
+
 Introduction
 ============
 
-- 
Repository URL: https://hg.python.org/cpython
