summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-03-16 20:02:39 +0100
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-03-16 20:02:39 +0100
commit69da648099044a98f094b746c4d0295baf843ea2 (patch)
tree2ec89c3ef7aea39affe42c0737057b6d49fef4e8 /docs
parent0b3d2302b8b209c7bed8bdad6e1a6cff34889779 (diff)
parentff3ee4aa6c6800d813162c09a58c6265c4675701 (diff)
downloadpython-setuptools-git-69da648099044a98f094b746c4d0295baf843ea2.tar.gz
merge with upstream
--HG-- branch : distribute extra : rebase_source : 2ad13527b742644596b32fcd8feac7276b4a477e
Diffstat (limited to 'docs')
-rw-r--r--docs/easy_install.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 3e39b811..a469bb55 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -768,6 +768,11 @@ 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.
+
``--delete-conflicting, -D`` (Removed in 0.6a11)
(As of 0.6a11, this option is no longer necessary; please do not use it!)