Fix broken download URL for PyPI in setup call, minor readme updates.

IPython/core/release.py

@@ -36,19 +36,19 b" __version__ = '.'.join(map(str, _ver))"
 
 version = __version__  # backwards compatibility name
 
-description = "An interactive computing environment for Python"
+description = "IPython: Productive Interactive Computing"
 
 long_description = \
 """
-The goal of IPython is to create a comprehensive environment for
-interactive and exploratory computing.  To support this goal, IPython
-has two main components:
+IPython provides a rich toolkit to help you make the most out of using Python
+interactively.  Its main components are:
 
-* An enhanced interactive Python shell.
+* Powerful interactive Python shells (terminal- and Qt-based).
+* Support for interactive data visualization and use of GUI toolkits.
+* Flexible, embeddable interpreters to load into your own projects.
+* Tools for high level and interactive parallel computing.
 
-* An architecture for interactive parallel computing.
-
-The enhanced interactive Python shell has the following main features:
+The enhanced interactive Python shells have the following main features:
 
 * Comprehensive object introspection.
 
@@ -116,8 +116,10 b" author_email = '[e-mail]'"
 
 url = 'http://ipython.org'
 
-download_url = 'http://ipython.scipy.org/dist'
+# This will only be valid for actual releases sent to PyPI, but that's OK since
+# those are the ones we want pip/easy_install to be able to find.
+download_url = 'http://archive.ipython.org/release/%s' % version
 
-platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
+platforms = ['Linux','Mac OSX','Windows XP/2000/NT']
 
 keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed']

README.rst

@@ -1,14 +1,15 b''
-==============
-IPython README
-==============
+===========================================
+ IPython: Productive Interactive Computing
+===========================================
 
 Overview
 ========
 
-Welcome to IPython. Our full documentation can be found in the ``docs/dist``
-subdirectory in ``.html`` and ``.pdf`` formats, also available online at our
-`docs repo <http://ipython.github.com/ipython-doc>`_.  The ``docs/source`` directory 
-contains the plaintext version of these manuals.
+Welcome to IPython. Our full documentation, including PDF versions of our
+manual, is available on `our website <http://ipython.org/documentation.html>`_;
+if you downloaded a built source distribution the ``docs/html`` directory
+contains an HTML version of the manual.  The ``docs/source`` directory contains
+the plaintext version of these manuals.
 
 
 Dependencies and supported Python versions
@@ -18,9 +19,9 b' For full details, see the installation section of the manual. The basic parts'
 of IPython only need the Python standard library, but much of its more advanced
 functionality requires extra packages.
 
-Officially, IPython requires Python version 2.6 or 2.7.  An experimental port
-of IPython to Python 3.x is being developed at
-http://github.com/ipython/ipython-py3k.
+Officially, IPython requires Python version 2.6 or 2.7.  A separate repository
+contains our Python 3 version, as explained `in our wiki
+<http://wiki.ipython.org/Python_3>`_.
 
     
 Instant running
@@ -30,4 +31,3 b' You can run IPython from this directory without even installing it system-wide'
 by typing at the terminal::
 
    $ python ipython.py
-