Merge doc change from 3.3
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
index e93f48e..e9ede8b 100644
--- 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.