have setup.py long_description just be README.rst

4 files changed, 16 insertions, 15 deletions

diff --git a/PROJECT.txt b/PROJECT.txt
deleted file mode 100644
index df0673847..000000000
--- a/PROJECT.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Project Info
-============
-
-* Project Page: https://github.com/pypa/pip
-* Install howto: http://www.pip-installer.org/en/latest/installing.html
-* Changelog: http://www.pip-installer.org/en/latest/news.html
-* Bug Tracking: https://github.com/pypa/pip/issues
-* Mailing list: http://groups.google.com/group/python-virtualenv
-* Docs: http://www.pip-installer.org/
-* User IRC: #pip on Freenode.
-* Dev IRC: #pypa on Freenode.
diff --git a/README.rst b/README.rst
index e188a6aa9..32c7d3acc 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,24 @@
 pip
 ===
 
+The `PyPA recommended
+<https://python-packaging-user-guide.readthedocs.org/en/latest/current.html>`_
+tool for installing and managing Python packages.
+
+* `Installation <http://www.pip-installer.org/en/latest/installing.html>`_
+* `Documentation <http://www.pip-installer.org>`_
+* `Changelog <http://www.pip-installer.org/en/latest/news.html>`_
+* `Github Page <https://github.com/pypa/pip>`_
+* `Issue Tracking <https://github.com/pypa/pip/issues>`_
+* `Mailing list <http://groups.google.com/group/python-virtualenv>`_
+* User IRC: #pip on Freenode.
+* Dev IRC: #pypa on Freenode.
+
+
 .. image:: https://pypip.in/v/pip/badge.png
         :target: https://pypi.python.org/pypi/pip
 
 .. image:: https://secure.travis-ci.org/pypa/pip.png?branch=develop
    :target: http://travis-ci.org/pypa/pip
 
-For documentation, see http://www.pip-installer.org
+
diff --git a/setup.py b/setup.py
index 61e870c45..e04a22db4 100644
--- a/setup.py
+++ b/setup.py
@@ -38,8 +38,7 @@ def find_version(*file_paths):
         return version_match.group(1)
     raise RuntimeError("Unable to find version string.")
 
-long_description = "\n" + "\n".join([read('PROJECT.txt'),
-                                     read('docs', 'quickstart.rst')])
+long_description = read('README.rst')
 
 tests_require = ['pytest', 'virtualenv>=1.10', 'scripttest>=1.3', 'mock']
 
diff --git a/tox.ini b/tox.ini
index 59e9d93f1..8d37a8b55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,6 @@ basepython = python2.7
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
 
-
 [testenv:pep8]
 basepython = python2.7
 deps = flake8