[Python-checkins] cpython (merge 3.4 -> default): Merge doc change from 3.3

[jason.coombs]

http://hg.python.org/cpython/rev/7e1b3f804279
changeset:   90677:7e1b3f804279
parent:      90674:bc324a49d0fc
parent:      90676:fa5779a62b5d
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Mon May 12 22:41:49 2014 -0400
summary:
  Merge doc change from 3.3

files:
  Doc/library/venv.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -40,11 +40,11 @@
    A venv is a directory tree which contains Python executable files and
    other files which indicate that it is a venv.
 
-   Common installation tools such as ``Distribute`` and ``pip`` work as
+   Common installation tools such as ``Setuptools`` and ``pip`` work as
    expected with venvs - i.e. when a venv is active, they install Python
    packages into the venv without needing to be told to do so explicitly.
    Of course, you need to install them into the venv first: this could be
-   done by running ``distribute_setup.py`` with the venv activated,
+   done by running ``ez_setup.py`` with the venv activated,
    followed by running ``easy_install pip``. Alternatively, you could download
    the source tarballs and run ``python setup.py install`` after unpacking,
    with the venv activated.

-- 
Repository URL: http://hg.python.org/cpython