diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-11-04 06:42:35 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-11-04 06:42:35 (GMT) |
commit | 1897c9860ade900b7cb94c8be86f5fdb310bcc2f (patch) | |
tree | 62808803b0c90b1a2285d748564809ead916fe0a /Doc | |
parent | 26825bcb8da9dd1669fc1f4e698bd0454c78063c (diff) | |
parent | c2f01213ed5c616a37a87cdd9c682be4e3479e21 (diff) | |
download | cpython-1897c9860ade900b7cb94c8be86f5fdb310bcc2f.zip cpython-1897c9860ade900b7cb94c8be86f5fdb310bcc2f.tar.gz cpython-1897c9860ade900b7cb94c8be86f5fdb310bcc2f.tar.bz2 |
merge 3.4
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/distutils/index.rst | 7 | ||||
-rw-r--r-- | Doc/install/index.rst | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst index 90d1c1a..335f804 100644 --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -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. diff --git a/Doc/install/index.rst b/Doc/install/index.rst index 2ea047a..9376c68 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -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 ============ |