merge 3.5

This commit is contained in:
Benjamin Peterson 2015-11-03 22:42:42 -08:00
commit 0f1f980782
2 changed files with 9 additions and 10 deletions

View File

@ -15,10 +15,9 @@ very little overhead for build/release/install mechanics.
.. 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.

View File

@ -27,17 +27,17 @@ modules and extensions.
.. 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
============