Merge pull request #2161 from stevepiercy/master

update references to python-distribute.org (see #2141 for discussion)

2 files changed, 6 insertions, 6 deletions

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 25f3931e9..ec40bc67c 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -680,8 +680,8 @@ testing, packaging, and distributing your application.
    ``setup.py`` is the de facto standard which Python developers use to
    distribute their reusable code.  You can read more about ``setup.py`` files
    and their usage in the `Setuptools documentation
-   <http://peak.telecommunity.com/DevCenter/setuptools>`_ and `The Hitchhiker's
-   Guide to Packaging <http://guide.python-distribute.org/>`_.
+   <http://peak.telecommunity.com/DevCenter/setuptools>`_ and `Python Packaging
+   User Guide <https://packaging.python.org/en/latest/>`_.
 
 Our generated ``setup.py`` looks like this:
 
diff --git a/docs/narr/scaffolding.rst b/docs/narr/scaffolding.rst
index 8677359de..164ceb3bf 100644
--- a/docs/narr/scaffolding.rst
+++ b/docs/narr/scaffolding.rst
@@ -22,10 +22,10 @@ found by the ``pcreate`` command.
 
 To create a scaffold template, create a Python :term:`distribution` to house
 the scaffold which includes a ``setup.py`` that relies on the ``setuptools``
-package.  See `Creating a Package
-<http://guide.python-distribute.org/creation.html>`_ for more information about
-how to do this.  For example, we'll pretend the distribution you create is
-named ``CoolExtension``, and it has a package directory within it named
+package.  See `Packaging and Distributing Projects
+<https://packaging.python.org/en/latest/distributing/>`_ for more information
+about how to do this.  For example, we'll pretend the distribution you create
+is named ``CoolExtension``, and it has a package directory within it named
 ``coolextension``.
 
 Once you've created the distribution, put a "scaffolds" directory within your