Issue #26014: Update 3.x packaging documentation:

- "See also" links to the new docs are now provided in the legacy pages
- links to setuptools documentation have been updated

(original patch by Susan Sun)

diff --git a/Doc/distributing/index.rst b/Doc/distributing/index.rst
index d51ff9990bbf4f06da8c7753090a094276d46c1d..82ecd2c1ef45fbef9ed98c17416830cb804de00b 100644 (file)
--- a/Doc/distributing/index.rst
+++ b/Doc/distributing/index.rst
@@ -61,7 +61,7 @@ Key terms
   extensions, to be installed on a system without needing to be built
   locally.
 
-.. _setuptools: https://setuptools.pypa.io/en/latest/setuptools.html
+.. _setuptools: https://setuptools.readthedocs.io/en/latest/
 .. _wheel: https://wheel.readthedocs.org
 
 Open source licensing and collaboration

diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst
index 335f804d42f3ba062f8d186ce3853efca9646188..c565bcc562862490828bfb011464e2f9d488a7d1 100644 (file)
--- a/Doc/distutils/index.rst
+++ b/Doc/distutils/index.rst
@@ -7,6 +7,11 @@
 :Authors: Greg Ward, Anthony Baxter
 :Email: distutils-sig@python.org
 
+.. seealso::
+
+   :ref:`distributing-index`
+      The up to date module distribution documentations
+
 This document describes the Python Distribution Utilities ("Distutils") from
 the module developer's point of view, describing how to use the Distutils to
 make Python modules and extensions easily available to a wider audience with
@@ -20,7 +25,6 @@ very little overhead for build/release/install mechanics.
    recommendations section <https://packaging.python.org/en/latest/current/>`__
    in the Python Packaging User Guide for more information.
 
-
 .. toctree::
    :maxdepth: 2
    :numbered:

diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index a4084072e6ab5f38e00c346793d2c86f20d04e86..b22fc5958ce4c60f6ba477ad2442cf09a1a7753a 100644 (file)
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -10,6 +10,11 @@
 
 .. TODO: Fill in XXX comments
 
+.. seealso::
+
+   :ref:`installing-index`
+      The up to date module installation documentations
+
 .. The audience for this document includes people who don't know anything
    about Python and aren't about to learn the language just in order to
    install and maintain it for their users, i.e. system administrators.

diff --git a/Doc/library/distutils.rst b/Doc/library/distutils.rst
index e3d1314572554a66ea698c677a944b8f7de67938..12ad8c0b7b8431e44c809183aaddc5870d63bf87 100644 (file)
--- a/Doc/library/distutils.rst
+++ b/Doc/library/distutils.rst
@@ -15,7 +15,7 @@ collections of Python packages which include modules coded in both Python and C.
 Most Python users will *not* want to use this module directly, but instead
 use the cross-version tools maintained by the Python Packaging Authority. In
 particular,
-`setuptools <https://setuptools.pypa.io/en/latest/setuptools.html>`__ is an
+`setuptools <https://setuptools.readthedocs.io/en/latest/>`__ is an
 enhanced alternative to :mod:`distutils` that provides:
 
 * support for declaring project dependencies

diff --git a/Misc/NEWS b/Misc/NEWS
index 44920842883680614f0c150770ea4a5c79dca683..feb0c624b8a5325ca8fecb247a64dd0c6d59f08d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -543,6 +543,10 @@ Documentation
 - Issue #25500: Fix documentation to not claim that __import__ is searched for
   in the global scope.
 
+- Issue #26014: Update 3.x packaging documentation:
+  * "See also" links to the new docs are now provided in the legacy pages
+  * links to setuptools documentation have been updated
+
 Tests
 -----