summaryrefslogtreecommitdiff
path: root/docs/easy_install.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-03-01 12:20:57 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-03-01 12:20:57 -0500
commite4d630bf67f0cbb293ef7cac9e93e219ffd2c8ba (patch)
tree027054cb894105d69a86645c9ae5dec7326dfee0 /docs/easy_install.txt
parent98b3d8950df76702d5f7e980b5631dc020b612cd (diff)
downloadpython-setuptools-bitbucket-e4d630bf67f0cbb293ef7cac9e93e219ffd2c8ba.tar.gz
Updated documentation to reflect merged target name, only keeping legacy references to Distribute.
Diffstat (limited to 'docs/easy_install.txt')
-rw-r--r--docs/easy_install.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 9b4fcfbb..dac0fa8f 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -94,7 +94,7 @@ directory, you can also retarget the installation location for scripts so they
go on a directory that's already on the ``PATH``. For more information see the
sections below on `Command-Line Options`_ and `Configuration Files`_. You
can pass command line options (such as ``--script-dir``) to
-``distribute_setup.py`` to control where ``easy_install.exe`` will be installed.
+``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
@@ -776,10 +776,12 @@ Command-Line Options
package not being available locally, or due to the use of the ``--update``
or ``-U`` option.
-``--no-find-links`` Blocks the addition of any link. (New in Distribute 0.6.11)
- This is useful if you want to avoid adding links defined in a project
- easy_install is installing (wether it's a requested project or a
- dependency.). When used, ``--find-links`` is ignored.
+``--no-find-links`` Blocks the addition of any link.
+ This parameter is useful if you want to avoid adding links defined in a
+ project easy_install is installing (whether it's a requested project or a
+ dependency). When used, ``--find-links`` is ignored.
+
+ Added in Distribute 0.6.11 and Setuptools 0.7.
``--delete-conflicting, -D`` (Removed in 0.6a11)
(As of 0.6a11, this option is no longer necessary; please do not use it!)