aboutsummaryrefslogtreecommitdiffstats
path: root/docs/easy_install.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/easy_install.txt')
-rw-r--r--docs/easy_install.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 9b4fcfbb..12bc73ea 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -31,7 +31,7 @@ Using "Easy Install"
Installing "Easy Install"
-------------------------
-Please see the `setuptools PyPI page <http://pypi.python.org/pypi/setuptools>`_
+Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
for download links and basic installation instructions for each of the
supported platforms.
@@ -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!)
@@ -804,7 +806,7 @@ Command-Line Options
``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
Specifies the base URL of the Python Package Index. The default is
- http://pypi.python.org/simple if not specified. When a package is requested
+ https://pypi.python.org/simple if not specified. When a package is requested
that is not locally available or linked from a ``--find-links`` download
page, the package index will be searched for download pages for the needed
package, and those download pages will be searched for links to download
@@ -993,7 +995,7 @@ that the User installation scheme alone does not provide, e.g. the ability to hi
Please refer to the `virtualenv`_ documentation for more details.
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
+.. _virtualenv: https://pypi.python.org/pypi/virtualenv
@@ -1126,7 +1128,7 @@ History
0.6c7
* ``ftp:`` download URLs now work correctly.
- * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to use
+ * The default ``--index-url`` is now ``https://pypi.python.org/simple``, to use
the Python Package Index's new simpler (and faster!) REST API.
0.6c6