Cherry-picked commits from 0.12.1 release

IPython/core/release.py

@@ -2,7 +2,7 @@
 """Release data for the IPython project."""
 
 #-----------------------------------------------------------------------------
-#  Copyright (c) 2008-2011, IPython Development Team.
+#  Copyright (c) 2008-2012, IPython Development Team.
 #  Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
 #  Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
 #  Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
@@ -45,9 +45,12 @@
 interactively.  Its main components are:
 
 * Powerful interactive Python shells (terminal- and Qt-based).
+* A web-based interactive notebook environment with all shell features plus
+  support for embedded figures, animations and rich media.
 * 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.
+* A high-performance library for high level and interactive parallel computing
+  that works in multicore systems, clusters, supercomputing and cloud scenarios.
 
 The enhanced interactive Python shells have the following main features:
 
@@ -58,21 +61,22 @@
 * Caching of output results during a session with automatically generated
   references.
 
-* Readline based name completion.
+* Extensible tab completion, with support by default for completion of python
+  variables and keywords, filenames and function keywords.
 
 * 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).
+* A rich 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.
+* Easily embeddable in other Python programs and GUIs.
 
 * Integrated access to the pdb debugger and the Python profiler.
 
@@ -108,7 +112,8 @@
            'Nathan'   : ('Nathaniel Gray','n8gray@caltech.edu'),
            'Ville'    : ('Ville Vainio','vivainio@gmail.com'),
            'Brian'    : ('Brian E Granger', 'ellisonbg@gmail.com'),
-           'Min'      : ('Min Ragan-Kelley', 'benjaminrk@gmail.com')
+           'Min'      : ('Min Ragan-Kelley', 'benjaminrk@gmail.com'),
+           'Thomas'   : ('Thomas A. Kluyver', 'takowl@gmail.com'),
            }
 
 author = 'The IPython Development Team'
@@ -121,9 +126,10 @@
 # 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']
+platforms = ['Linux','Mac OSX','Windows XP/2000/NT/Vista/7']
 
-keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed']
+keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed',
+            'Web-based computing', 'Qt console', 'Embedding']
 
 classifiers = [
     'Intended Audience :: Developers',

IPython/frontend/html/notebook/static/unminified/README

@@ -0,0 +1,14 @@
+We use minified versions of JQuery / jQueryUI and google-code-prettify in the Notebook.
+
+Some package managers require full versions alongside minified, and they can be
+dropped in here, if necessary.
+
+origins of our minified js:
+prettify:  http://google-code-prettify.googlecode.com/files/prettify-small-1-Jun-2011.tar.bz2
+jQuery-1.6.2: http://code.jquery.com/jquery-1.6.2.min.js
+jQueryUI-1.8.14: generated by https://jqueryui.com/download
+
+And their unminified counterparts:
+prettify:  http://google-code-prettify.googlecode.com/files/prettify-1-Jun-2011.tar.bz2
+jQuery-1.6.2: http://code.jquery.com/jquery-1.6.2.js
+jQueryUI-1.8.14: https://github.com/jquery/jquery-ui/tarball/1.8.14

MANIFEST.in

@@ -1,3 +1,4 @@
+include README.rst
 include ipython.py
 include setup2.py
 include setup3.py
@@ -20,7 +21,7 @@ include IPython/frontend/qt/console/resources/icon/IPythonConsole.svg
 # Documentation
 graft docs
 exclude docs/\#*
-exclude docs/man/*.1
+exclude docs/man/*.1.gz
 
 # docs subdirs we want to skip
 prune docs/attic

README.rst

@@ -5,11 +5,11 @@
 Overview
 ========
 
-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.
+Welcome to IPython.  Our full documentation is available on `our website
+<http://ipython.org/documentation.html>`_; if you downloaded a built source
+distribution the ``docs/source`` directory contains the plaintext version of
+these manuals.  If you have Sphinx installed, you can build them by typing
+``make html`` for local browsing.
 
 
 Dependencies and supported Python versions

docs/source/development/release.txt

@@ -26,8 +26,7 @@ Most of the release process is automated by the :file:`release` script in the
    installer.  It posts them to the site and registers the release with PyPI.
 
 #. Update the website with announcements and links to the updated changes.txt
-   in html form. Remember to put a short note both on the news page of the 
-   site and on Launcphad.
+   in html form. Remember to put a short note on the news page of the site.
 
 #. Drafting a short release announcement with i) highlights and ii) a link to
    the html version of the :ref:`Whats new <whatsnew_index>` section of the 
@@ -43,4 +42,4 @@ Most of the release process is automated by the :file:`release` script in the
    - Run ``git add`` for all the new files and commit.
    - Run ``git push`` to update the public version of the docs on gh-pages.
 
-#. Celebrate!
+#. Celebrate!