update installation docs related to ssl

CHANGES.txt

@@ -5,7 +5,7 @@ develop (unreleased)
 --------------------
 
 * SSL Cert Verification; Make https the default for PyPI access.
-  Thanks James Cleveland and many others (Pull #789).
+  Thanks James Cleveland, Giovanni Bajo and many others (Pull #789).
 
 * Added "pip list" for listing installed packages and the latest version
   available. Thanks Rafael Caricio, Miguel Araujo, Dmitry Gladkov (Pull #752)

docs/index.txt

@@ -6,7 +6,7 @@ A tool for installing and managing Python packages.
 `Mailing list <http://groups.google.com/group/python-virtualenv>`_ ``|``
 `Issues <https://github.com/pypa/pip/issues>`_ ``|``
 `Github <https://github.com/pypa/pip>`_ ``|``
-`PyPI <http://pypi.python.org/pypi/pip/>`_ ``|``
+`PyPI <https://pypi.python.org/pypi/pip/>`_ ``|``
 irc:#pip
 
 

docs/installing.txt

@@ -3,11 +3,21 @@
 Installation
 ============
 
-Python Support
---------------
+.. warning::
+
+    Prior to version 1.3, pip did not use SSL for downloading packages from PyPI, and thus left
+    users more vulnerable to security threats. We advise installing at least version 1.3.
+    If you're using `virtualenv <http://www.virtualenv.org>`_ to install pip, we advise installing
+    at least version 1.8.5, which contains pip version 1.3.
+
+
+Python & OS Support
+-------------------
 
 pip works with CPython versions 2.5, 2.6, 2.7, 3.1, 3.2, 3.3 and also pypy.
 
+pip works on Unix/Linux, OS X, and Windows.
+
 
 Using virtualenv
 ----------------
@@ -33,27 +43,50 @@ Installing Globally
 pip can be installed globally in order to manage global packages.
 Often this requires the installation to be performed as root.
 
-Prerequisites
-+++++++++++++
+.. warning::
 
-A global install of pip requires either `setuptools <http://pypi.python.org/pypi/setuptools>`_
-or `distribute <http://pypi.python.org/pypi/distribute>`_ to be installed globally as well.
+    We advise against using easy_install to install pip, because easy_install
+    does not download from PyPI over SSL, so the installation might be insecure.
+    Since pip can then be used to install packages (which execute code on
+    your computer), it is better to go through a trusted path.
 
-In many cases, these can be installed using your OS package manager.
 
-See the `Distribute Install Instructions <http://pypi.python.org/pypi/distribute/>`_ or the
-`Setuptools Install Instructions <http://pypi.python.org/pypi/setuptools#installation-instructions>`_
+Requirements
+++++++++++++
+
+pip requires either `setuptools <https://pypi.python.org/pypi/setuptools>`_
+or `distribute <https://pypi.python.org/pypi/distribute>`_.
+
+See the `Distribute Install Instructions <https://pypi.python.org/pypi/distribute/>`_ or the
+`Setuptools Install Instructions <https://pypi.python.org/pypi/setuptools#installation-instructions>`_
+
+If installing pip using a linux package manager, these requirements will be installed for you.
 
 .. warning::
 
     If you are using Python 3.X you **must** use distribute; setuptools doesn't
     support Python 3.X.
 
+
+Using a Package Manager
++++++++++++++++++++++++
+
+On Linux, pip is packaged by most distributions. For instance, on an Ubuntu
+system, you can install it with::
+
+    $ sudo apt-get install python-pip
+
+On a Fedora system, you can install it with::
+
+    $ yum install python-pip
+
+The latest versions of pip may not be available using this method.
+
+
 Using get-pip
 +++++++++++++
 
-Download `get-pip.py <https://raw.github.com/pypa/pip/master/contrib/get-pip.py>`_
-and execute it using Python.  This will only install pip, not the prerequisites.
+After installing the requirements:
 
 ::
 
@@ -61,8 +94,10 @@ and execute it using Python.  This will only install pip, not the prerequisites.
  $ [sudo] python get-pip.py
 
 
-From source
-+++++++++++
+Installing from source
+++++++++++++++++++++++
+
+After installing the requirements:
 
 ::