Add pypi.org term (pypa#365)

Author: Jon Wayne Parrott

source/glossary.rst

@@ -137,10 +137,17 @@ Glossary
 
     Python Package Index (PyPI)
 
-        `PyPI <https://pypi.python.org/pypi>`_ is the default :term:`Package
+        `PyPI <https://pypi.org>`_ is the default :term:`Package
         Index` for the Python community. It is open to all Python developers to
         consume and distribute their distributions.
 
+    pypi.org
+
+        `pypi.org <https://pypi.org>`_ is the domain name for the
+        :term:`Python Package Index (PyPI)`. It replaced the legacy index
+        domain name, `pypi.python.org`, in 2017. It is powered by
+        :ref:`warehouse`.
+
     Release
 
         A snapshot of a :term:`Project` at a particular point in time, denoted

source/guides/migrating-to-pypi-org.rst

@@ -3,11 +3,11 @@
 Migrating to PyPI.org
 =====================
 
-PyPI.org is a new, rewritten version of PyPI that is replacing the legacy code
-base located at pypi.python.org. As it becomes the default, and eventually only,
-version of PyPI people are expected to interact with, there will be a transition
-period where tooling and processes are expected to need to update to deal with
-the new location.
+:term:`PyPI.org` is a new, rewritten version of PyPI that is replacing the
+legacy code base located at `pypi.python.org`. As it becomes the default, and
+eventually only, version of PyPI people are expected to interact with, there
+will be a transition period where tooling and processes are expected to need to
+update to deal with the new location.
 
 This section covers how to migrate to the new PyPI.org for different tasks.
 

source/index.rst

@@ -25,7 +25,7 @@ happily accept any :doc:`contributions and feedback <contribute>`. 😊
 .. _GitHub: https://github.com/pypa/python-packaging-user-guide
 .. _Python Packaging Authority: https://pypa.io
 
-.. note:: Looking for guidance on migrating from legacy PyPI to pypi.org? Please see :doc:`guides/migrating-to-pypi-org`.
+.. note:: Looking for guidance on migrating from legacy PyPI to :term:`pypi.org`? Please see :doc:`guides/migrating-to-pypi-org`.
 
 Get started
 ===========

source/key_projects.rst

@@ -158,7 +158,8 @@ Warehouse
 Dev irc:#pypa-dev
 
 
-The new unreleased PyPI application which can be previewed at https://pypi.org/.
+The current codebase powering :term:`PyPI`. It is hosted at
+`pypi.org <https://pypi.org/>`_.
 
 
 .. _wheel: