intersphinx references to pypa.io

qwcode · qwcode · commit ece48f5deb2b · 2014-11-27T19:17:22.000-08:00
diff --git a/source/conf.py b/source/conf.py
@@ -28,7 +28,8 @@
 
 intersphinx_cache_limit = 0
 intersphinx_mapping = {
-    'pip': ('https://pip.pypa.io/en/latest/', None)
+    'pip': ('https://pip.pypa.io/en/latest/', None),
+    'pypa': ('https://pypa.io/en/latest/', None),
     }
 
 
diff --git a/source/current.rst b/source/current.rst
@@ -53,11 +53,11 @@ Packaging Tool Recommendations
        (which pip doesn't support).  For a detailed breakdown, see :ref:`pip vs
        easy_install`.
 
-.. [2] The acceptance of :ref:`PEP453 <PEP453s>` means that :ref:`pip` will be
-       available by default in most installations of Python 3.4 or later.  See
-       the `rationale section
+.. [2] The acceptance of :ref:`PEP453 <pypa:PEP453s>` means that :ref:`pip`
+       will be available by default in most installations of Python 3.4 or
+       later.  See the `rationale section
        <http://www.python.org/dev/peps/pep-0453/#rationale>`_ from :ref:`PEP453
-       <PEP453s>` as for why pip was chosen.
+       <pypa:PEP453s>` as for why pip was chosen.
 
 .. [3] Beginning with Python 3.4, ``pyvenv`` will create virtualenv environments
        with ``pip`` installed, thereby making it an equal alternative to
@@ -89,7 +89,7 @@ Packaging Tool Recommendations
        uploading Windows and Mac OS X wheels, and they should be compatible with
        the binary installers provided for download from python.org. Enhancements
        will have to be made to the :ref:`wheel compatibility tagging scheme
-       <PEP425s>` before linux wheels will be allowed.
+       <pypa:PEP425s>` before linux wheels will be allowed.
 
 .. _distribute: https://pypi.python.org/pypi/distribute
 .. _pyvenv: http://docs.python.org/3.4/library/venv.html
diff --git a/source/distributing.rst b/source/distributing.rst
@@ -90,7 +90,7 @@ from `sampleproject/setup.py
 This will determine how your project is listed on :term:`PyPI <Python Package
 Index (PyPI)>`. For details on permitted characters, see the `name
 <http://legacy.python.org/dev/peps/pep-0426/#name>`_ section from :ref:`PEP426
-<PEP426s>`.
+<pypa:PEP426s>`.
 
 
 Version
@@ -106,7 +106,7 @@ from `sampleproject/setup.py
 
 Projects should aim to comply with the `version scheme
 <http://legacy.python.org/dev/peps/pep-0440/#public-version-identifiers>`_
-specified in :ref:`PEP440 <PEP440s>`.  Here are some examples:
+specified in :ref:`PEP440 <pypa:PEP440s>`.  Here are some examples:
 
 ::
 
@@ -427,7 +427,7 @@ OSX, or Windows, usually due to containing compiled extensions.
 
   :term:`PyPI <Python Package Index (PyPI)>` currently only allows uploads of
   platform wheels for Windows and OS X, NOT linux.  Currently, the wheel tag
-  specification (:ref:`PEP425 <PEP425s>`) does not handle the variation that can
+  specification (:ref:`PEP425 <pypa:PEP425s>`) does not handle the variation that can
   exist across linux distros.
 
 
diff --git a/source/glossary.rst b/source/glossary.rst
@@ -200,8 +200,8 @@ Glossary
 
     Wheel
 
-        A :term:`Built Distribution` format introduced by :ref:`PEP427s`, which
-        is intended to replace the :term:`Egg` format.  Wheel is currently
+        A :term:`Built Distribution` format introduced by :ref:`pypa:PEP427s`,
+        which is intended to replace the :term:`Egg` format.  Wheel is currently
         supported by :ref:`pip`.
 
     Working Set
diff --git a/source/installing.rst b/source/installing.rst
@@ -35,8 +35,8 @@ We recommend the following installation sequence:
 
 1. Install :ref:`pip` and :ref:`setuptools`: [3]_
 
-   If you have a :ref:`PEP453 <PEP453s>`-compliant Python 3.4, it may already
-   have the ``pip`` command available by default (and setuptools will be
+   If you have a :ref:`PEP453 <pypa:PEP453s>`-compliant Python 3.4, it may
+   already have the ``pip`` command available by default (and setuptools will be
    installed as well), or it may at least contain a working `ensurepip
    <https://docs.python.org/3.4/library/ensurepip.html>`_. To install pip (and
    setuptools) using ensurepip, run: ``python -m ensurepip --upgrade``.
diff --git a/source/technical.rst b/source/technical.rst
@@ -150,7 +150,7 @@ Here's a breakdown of the important differences between pip and easy_install now
 |List Installed Packages       |Yes (``pip list`` and ``pip       |No                             |
 |                              |freeze``)                         |                               |
 +------------------------------+----------------------------------+-------------------------------+
-|:ref:`PEP438 <PEP438s>`       |Yes                               |No                             |
+|:ref:`PEP438 <pypa:PEP438s>`  |Yes                               |No                             |
 |Support                       |                                  |                               |
 +------------------------------+----------------------------------+-------------------------------+
 |Installation format           |'Flat' packages with `egg-info`   | Encapsulated Egg format       |
@@ -195,7 +195,7 @@ easy_install and sys.path
 Wheel vs Egg
 ============
 
-* :term:`Wheel` has an :ref:`official PEP <PEP427s>`. :term:`Egg` did not.
+* :term:`Wheel` has an :ref:`official PEP <pypa:PEP427s>`. :term:`Egg` did not.
 
 * :term:`Wheel` is a :term:`distribution <Distribution Package>` format, i.e a packaging
   format. [2]_ :term:`Egg` was both a distribution format and a runtime
@@ -206,10 +206,10 @@ Wheel vs Egg
   compatible with Python 2 and 3, it's possible for a wheel to be "universal",
   similar to an :term:`sdist <Source Distribution (or "sdist")>`.
 
-* :term:`Wheel` uses :ref:`PEP376-compliant <PEP376s>` ``.dist-info``
+* :term:`Wheel` uses :ref:`PEP376-compliant <pypa:PEP376s>` ``.dist-info``
   directories. Egg used ``.egg-info``.
 
-* :term:`Wheel` has a :ref:`richer file naming convention <PEP425s>`. A single
+* :term:`Wheel` has a :ref:`richer file naming convention <pypa:PEP425s>`. A single
   wheel archive can indicate its compatibility with a number of Python language
   versions and implementations, ABIs, and system architectures.
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@`
`28`	`28`
`29`	`29`	`intersphinx_cache_limit = 0`
`30`	`30`	`intersphinx_mapping = {`
`31`		`- 'pip': ('https://pip.pypa.io/en/latest/', None)`
	`31`	`+ 'pip': ('https://pip.pypa.io/en/latest/', None),`
	`32`	`+ 'pypa': ('https://pypa.io/en/latest/', None),`
`32`	`33`	`}`
`33`	`34`
`34`	`35`