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

IPython/core/release.py

@@ -1,123 +1,125 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project."""
 
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2008-2011, IPython Development Team.
 #  Copyright (c) 2001-2007, Fernando Perez <[e-mail]>
 #  Copyright (c) 2001, Janko Hauser <[e-mail]>
 #  Copyright (c) 2001, Nathaniel Gray <[e-mail]>
 #
 #  Distributed under the terms of the Modified BSD License.
 #
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 # Name of the package for release purposes.  This is the name which labels
 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
 name = 'ipython'
 
 # IPython version information.  An empty _version_extra corresponds to a full
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 0
 _version_minor = 12
 _version_micro = ''  # use '' for first of series, number for 1 and above
 _version_extra = 'dev'
 #_version_extra = ''  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor]
 if _version_micro:
     _ver.append(_version_micro)
 if _version_extra:
     _ver.append(_version_extra)
 
 __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.
 
 * Input history, persistent across sessions.
 
 * Caching of output results during a session with automatically generated
   references.
 
 * Readline based name completion.
 
 * Extensible system of 'magic' commands for controlling the environment and
   performing many tasks related either to IPython or the operating system.
 
 * Configuration system with easy switching between different setups (simpler
   than changing $PYTHONSTARTUP environment variables every time).
 
 * Session logging and reloading.
 
 * Extensible syntax processing for special purpose situations.
 
 * Access to the system shell with user-extensible alias system.
 
 * Easily embeddable in other Python programs and wxPython GUIs.
 
 * Integrated access to the pdb debugger and the Python profiler. 
 
 The parallel computing architecture has the following main features:
 
 * Quickly parallelize Python code from an interactive Python/IPython session.
 
 * A flexible and dynamic process model that be deployed on anything from 
   multicore workstations to supercomputers.
 
 * An architecture that supports many different styles of parallelism, from
   message passing to task farming.
 
 * Both blocking and fully asynchronous interfaces.
 
 * High level APIs that enable many things to be parallelized in a few lines
   of code.
 
 * Share live parallel jobs with other users securely.  
 
 * Dynamically load balanced task farming system.
 
 * Robust error handling in parallel code.
 
 The latest development version is always available from IPython's `GitHub
 site <http://github.com/ipython>`_.
 """
 
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]'),
            'Ville'    : ('Ville Vainio','[e-mail]'),
            'Brian'    : ('Brian E Granger', '[e-mail]'),
            'Min'      : ('Min Ragan-Kelley', '[e-mail]')
            }
 
 author = 'The IPython Development Team'
 
 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,33 +1,33 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
 ==========================================
 
 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
 ===============
 
 You can run IPython from this directory without even installing it system-wide
 by typing at the terminal::
 
    $ python ipython.py
-