Change "distribute" to "setuptools" in docs

Replace several out-dated references to Distribute with setuptools.

Change-Id: I8ddd56f0364dee31fd684d3e324f61adf6f95941

Author: dhellmann

docs/source/command_ref.rst

@@ -33,7 +33,7 @@ activated after being initialized.
     $ workon
     $ mkvirtualenv mynewenv
     New python executable in mynewenv/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -79,7 +79,7 @@ A unique virtualenv name is generated.
     New python executable in 1e513ac6-616e-4d56-9aa5-9d0a3b305e20/bin/python
     Overwriting 1e513ac6-616e-4d56-9aa5-9d0a3b305e20/lib/python2.7/distutils/__init__.py 
     with new content
-    Installing distribute...............................................
+    Installing setuptools...............................................
     ....................................................................
     .................................................................done.
     This is a temporary environment. It will be deleted when deactivated.
@@ -180,7 +180,7 @@ Syntax::
     $ workon 
     $ mkvirtualenv source
     New python executable in source/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -248,13 +248,13 @@ is printed to stdout.
     $ workon 
     $ mkvirtualenv env1
       New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
     (env1)$ mkvirtualenv env2
     New python executable in env2/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -301,7 +301,7 @@ Syntax::
 
     $ mkvirtualenv env1
     New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -342,7 +342,7 @@ subdirectory.
 
     $ mkvirtualenv env1
     New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -376,7 +376,7 @@ directory to change into.
 
     $ mkvirtualenv env1
     New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -400,13 +400,13 @@ Syntax::
 
     $ mkvirtualenv env1
     New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
     (env1)$ $ workon env1
     (env1)$ lssitepackages 
-    distribute-0.6.10-py2.6.egg     pip-0.6.3-py2.6.egg
+    setuptools-0.6.10-py2.6.egg     pip-0.6.3-py2.6.egg
     easy-install.pth                setuptools.pth
 
 ===============
@@ -462,7 +462,7 @@ output.
 
     $ mkvirtualenv env1
     New python executable in env1/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -505,7 +505,7 @@ create a virtual environment with the same name as the project.
 
     $ mkproject myproj
     New python executable in myproj/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
@@ -540,14 +540,14 @@ virtualenv and project directory.  An association is made so that when
 
     $ mkproject myproj
     New python executable in myproj/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.
     Creating /Users/dhellmann/Devel/myproj
     (myproj)$ mkvirtualenv myproj_new_libs
     New python executable in myproj/bin/python
-    Installing distribute.............................................
+    Installing setuptools.............................................
     ..................................................................
     ..................................................................
     done.

docs/source/index.rst

@@ -50,7 +50,7 @@ installed by pip.
   $ source /usr/local/bin/virtualenvwrapper.sh
   $ mkvirtualenv env1
   Installing
-  distribute..........................................
+  setuptools..........................................
   ....................................................
   ....................................................
   ...............................done.
@@ -79,15 +79,15 @@ We can see the new package with ``lssitepackages``::
 
   (env1)$ lssitepackages
   Django-1.1.1-py2.6.egg-info     easy-install.pth
-  distribute-0.6.10-py2.6.egg     pip-0.6.3-py2.6.egg
+  setuptools-0.6.10-py2.6.egg     pip-0.6.3-py2.6.egg
   django                          setuptools.pth
 
 Of course we are not limited to a single virtualenv::
 
   (env1)$ ls $WORKON_HOME
   env1            hook.log
   (env1)$ mkvirtualenv env2
-  Installing distribute...............................
+  Installing setuptools...............................
   ....................................................
   ....................................................
   ........... ...............................done.
@@ -124,7 +124,7 @@ created, letting you automatically install commonly-used tools.
   (env2)$ echo 'pip install sphinx' >> $WORKON_HOME/postmkvirtualenv
   (env3)$ mkvirtualenv env3
   New python executable in env3/bin/python
-  Installing distribute...............................
+  Installing setuptools...............................
   ....................................................
   ....................................................
   ........... ...............................done.

docs/source/plugins.rst

@@ -16,7 +16,7 @@ There are two ways to attach your code so that virtualenvwrapper will
 run it: End-users can use shell scripts or other programs for personal
 customization, e.g. automatically performing an action on every new
 virtualenv (see :ref:`scripts`).  Extensions can also be
-implemented in Python by using Distribute_ *entry points*, making it
+implemented in Python by using `Setuptools entry points`_, making it
 possible to share common behaviors between systems and developers.
 
 Use the hooks provided to eliminate repetitive manual operations and
@@ -162,48 +162,22 @@ Registering Entry Points
 
 The functions defined in the plugin need to be registered as *entry
 points* in order for virtualenvwrapper's hook loader to find them.
-Distribute_ entry points are configured in the ``setup.py`` for your
-package by mapping the entry point name to the function in the package
-that implements it.
+Entry points are configured in the ``setup.py`` (or ``setup.cfg`` when
+using pbr) for your package by mapping the entry point name to the
+function in the package that implements it.
 
-This partial copy of virtualenvwrapper's ``setup.py`` illustrates how
+This partial copy of virtualenvwrapper's ``setup.cfg`` illustrates how
 the ``initialize()`` and ``initialize_source()`` entry points are
 configured.
 
-::
-    
-    # Bootstrap installation of Distribute
-    import distribute_setup
-    distribute_setup.use_setuptools()
-    
-    from setuptools import setup
-    
-    setup(
-        name = 'virtualenvwrapper',
-        version = '2.0',
-        
-        description = 'Enhancements to virtualenv',
-    
-        # ... details omitted ...
-
-        namespace_packages = [ 'virtualenvwrapper' ],
-    
-        entry_points = {
-            'virtualenvwrapper.initialize': [
-                'user_scripts = virtualenvwrapper.user_scripts:initialize',
-                ],
-            'virtualenvwrapper.initialize_source': [
-                'user_scripts = virtualenvwrapper.user_scripts:initialize_source',
-                ],
-    
-            # ... details omitted ...
-            },
-        )
+.. include:: ../../setup.cfg
+   :literal:
+   :start-after: [entry_points]
 
-The ``entry_points`` argument to ``setup()`` is a dictionary mapping
-the entry point *group names* to lists of entry point specifiers.  A
-different group name is defined by virtualenvwrapper for each
-extension point (see :ref:`plugins-extension-points`).
+The ``entry_points`` section maps the *group names* to lists of entry
+point specifiers.  A different group name is defined by
+virtualenvwrapper for each extension point (see
+:ref:`plugins-extension-points`).
 
 The entry point specifiers are strings with the syntax ``name =
 package.module:function``.  By convention, the *name* of each entry
@@ -212,8 +186,8 @@ used).
 
 .. seealso::
 
-  * `namespace packages <http://packages.python.org/distribute/setuptools.html#namespace-packages>`__
-  * `Extensible Applications and Frameworks <http://packages.python.org/distribute/setuptools.html#extensible-applications-and-frameworks>`__
+  * `namespace packages <http://pythonhosted.org//setuptools/setuptools.html#namespace-packages>`__
+  * `Extensible Applications and Frameworks <http://pythonhosted.org/setuptools/setuptools.html#extensible-applications-and-frameworks>`__
 
 The Hook Loader
 ---------------
@@ -420,6 +394,6 @@ and::
 
 respectively.
 
-.. _Distribute: http://packages.python.org/distribute/
+.. _Setuptools entry points: http://pythonhosted.org//setuptools/pkg_resources.html#entry-points
 
 .. _project: http://www.doughellmann.com/projects/virtualenvwrapper.project/