bpo-36797: Reduce levels of indirection in outdated distutils docs (GH-13462)

(cherry picked from commit e788057a9188ff37e232729815dfda2529079420)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>

diff --git a/Doc/distributing/index.rst b/Doc/distributing/index.rst
index 5dd14b1f7a60b95f0a2e073c2e7d557737dc77da..2e46c7ac8635e84d7c8b53d428967e9e7e222039 100644 (file)
--- a/Doc/distributing/index.rst
+++ b/Doc/distributing/index.rst
@@ -113,11 +113,17 @@ recommended tools`_.
 
 .. _currently recommended tools: https://packaging.python.org/guides/tool-recommendations/#packaging-tool-recommendations
 
-Reading the guide
-=================
+.. index::
+   single: Python Package Index (PyPI)
+   single: PyPI; (see Python Package Index (PyPI))
+
+.. _publishing-python-packages:
+
+Reading the Python Packaging User Guide
+=======================================
 
 The Python Packaging User Guide covers the various key steps and elements
-involved in creating a project:
+involved in creating and publishing a project:
 
 * `Project structure`_
 * `Building and packaging the project`_

diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst
index d6f7640fcb6826a712cc19cc87b276f8edc1c156..aaf4536dfa5431fd8523e6fa636ab09487693502 100644 (file)
--- a/Doc/distutils/index.rst
+++ b/Doc/distutils/index.rst
@@ -34,7 +34,6 @@ very little overhead for build/release/install mechanics.
    configfile.rst
    sourcedist.rst
    builtdist.rst
-   packageindex.rst
    examples.rst
    extending.rst
    commandref.rst

diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
index f74c4396e54581bdbb08c2dc27ad9e482d07ad21..ccb9a598b2b7a2955e5377a0e47d24abdced6dea 100644 (file)
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -1,6 +1,4 @@
-.. index::
-   single: Python Package Index (PyPI)
-   single: PyPI; (see Python Package Index (PyPI))
+:orphan:
 
 .. _package-index:
 
@@ -12,6 +10,7 @@ The `Python Package Index (PyPI)`_ stores metadata describing distributions
 packaged with distutils and other publishing tools, as well the distribution
 archives themselves.
 
-Detailed instructions on using PyPI at :ref:`distributing-index`.
+References to up to date PyPI documentation can be found at
+:ref:`publishing-python-packages`.
 
 .. _Python Package Index (PyPI): https://pypi.org

diff --git a/Doc/distutils/uploading.rst b/Doc/distutils/uploading.rst
index 4bce6997f9f83aec1188963c55e51cec7a27c171..4c391cab072ea6a41d67b23c1f616123c4b9f1b3 100644 (file)
--- a/Doc/distutils/uploading.rst
+++ b/Doc/distutils/uploading.rst
@@ -4,4 +4,5 @@
 Uploading Packages to the Package Index
 ***************************************
 
-The contents of this page have moved to the section :ref:`package-index`.
+References to up to date PyPI documentation can be found at
+:ref:`publishing-python-packages`.