new install instructions after release of setuptools-0.8/distribute-0…

….7.3

docs/installing.rst

@@ -56,38 +56,23 @@ Often this requires the installation to be performed as root.
 Requirements
 ++++++++++++
 
-.. note::
-
-  These instructions will change after setuptools-0.8 and distribute-0.7.3 are released to pypi on ~July 7th.
-
-pip requires `setuptools`_. As of v1.4, pip recommends `setuptools`_ >=0.8b2, not
+pip requires `setuptools`_. As of v1.4, pip recommends `setuptools`_ >=0.8, not
 `distribute`_ (the fork of setuptools) and the wheel support *requires*
-`setuptools`_ >=0.8b2. `setuptools`_ and `distribute`_ are now merged back together as
+`setuptools`_ >=0.8. `setuptools`_ and `distribute`_ are now merged back together as
 "setuptools".
 
-setuptools-0.8 beta downloads can be found here: https://bitbucket.org/pypa/setuptools/downloads
-
 For details on installing setuptools from scratch, see the install instructions
 on the `setuptools pypi page <https://pypi.python.org/pypi/setuptools>`_
 
-If you already have `setuptools`_ or `distribute`_, you can upgrade using pip
-depending on what you have. If ``python -c "import setuptools;
-print(setuptools._distribute)"`` returns True, then you have distribute,
-otherwise you have setuptools.
-
-If you have setuptools::
-
-  pip install --find-links=https://bitbucket.org/pypa/setuptools/downloads -U setuptools
-
-If you have distribute::
-
-  pip install --find-links=https://bitbucket.org/pypa/setuptools/downloads -U distribute
+If you already have `setuptools`_ or `distribute`_ (and pip), you can upgrade
+like so::
 
-This will upgrade to you distribute-0.7.X, which is just a wrapper, that depends
-on setuptools. The end result will be that you have distribute-0.7.X (which does
-nothing) *and* the latest setuptools installed.
+  pip install --upgrade setuptools
 
-If you already have pip-1.4, add "--pre" to the commands above so pip can find the setuptools-0.8 betas.
+If you had distribute before, this will upgrade to you distribute-0.7.X, which
+is just a wrapper, that depends on setuptools. The end result will be that you
+have distribute-0.7.X (which does nothing) *and* the latest setuptools
+installed.
 
 
 .. _setuptools: https://pypi.python.org/pypi/setuptools