Fix padding of matplotlib figures, after much whining from Stefan :)

IPython/config/application.py

@@ -48,9 +48,9 b' from IPython.utils.text import indent, wrap_paragraphs, dedent'
 option_description = """
 IPython command-line arguments are passed as '--<flag>', or '--<name>=<value>'.
 
-Arguments that take values are actually aliases to full Configurables, whose
-aliases are listed on the help line. For more information on full
-configurables, see '--help-all'.
+Arguments that take values are actually convenience aliases to full
+Configurables, whose aliases are listed on the help line. For more information
+on full configurables, see '--help-all'.
 """.strip() # trim newlines of front and back
 
 keyvalue_description = """
@@ -250,8 +250,8 b' class Application(SingletonConfigurable):'
         for p in wrap_paragraphs(self.subcommand_description):
             lines.append(p)
             lines.append('')
-        for subc, (cls,help) in self.subcommands.iteritems():
-            lines.append("%s : %s"%(subc, cls))
+        for subc, (cls, help) in self.subcommands.iteritems():
+            lines.append(subc)
             if help:
                 lines.append(indent(dedent(help.strip())))
         lines.append('')

IPython/core/usage.py

@@ -13,14 +13,23 b' import sys'
 from IPython.core import release
 
 cl_usage = """\
-ipython [options] [files]
+=========
+ IPython
+=========
 
-IPython: an enhanced interactive Python shell.
+Tools for Interactive Computing in Python
+=========================================
 
     A Python shell with automatic history (input and output), dynamic object
     introspection, easier configuration, command completion, access to the
     system shell and more.  IPython can also be embedded in running programs.
 
+
+Usage
+-----
+
+    ipython [subcommand] [options] [files]
+
     If invoked with no options, it executes all the files listed in sequence
     and exits, use -i to enter interactive mode after running the files.  Files
     ending in .py will be treated as normal Python, but files ending in .ipy
@@ -28,25 +37,25 b' IPython: an enhanced interactive Python shell.'
 
     Almost all configuration in IPython is available via the command-line. Do
     `ipython --help-all` to see all available options.  For persistent
-    configuration, Look into your ipython_config.py configuration file for 
+    configuration, look into your `ipython_config.py` configuration file for 
     details.
 
-    This file is typically installed in the IPYTHON_DIR directory, and there
+    This file is typically installed in the `IPYTHON_DIR` directory, and there
     is a separate configuration directory for each profile. The default profile
-    directory will be located in $IPYTHON_DIR/profile_default. For Linux
-    users, IPYTHON_DIR will be $HOME/.config/ipython, and for other users it will be
-    $HOME/.ipython.  For Windows users, $HOME resolves to C:\\Documents and
-    Settings\\YourUserName in most instances.
+    directory will be located in $IPYTHON_DIR/profile_default. For Linux users,
+    IPYTHON_DIR defaults to `$HOME/.config/ipython`, and for other Unix systems
+    to `$HOME/.ipython`.  For Windows users, $HOME resolves to C:\\Documents
+    and Settings\\YourUserName in most instances.
     
-    To initialize a profile with the default configuration file, do:
+    To initialize a profile with the default configuration file, do::
     
       $> ipython profile create
     
-    and start editing IPYTHON_DIR/profile_default/ipython_config.py
+    and start editing `IPYTHON_DIR/profile_default/ipython_config.py`
 
-    In IPython's documentation, we will refer to this directory as IPYTHON_DIR,
-    you can change its default location by setting any path you want in this
-    environment variable.
+    In IPython's documentation, we will refer to this directory as
+    `IPYTHON_DIR`, you can change its default location by creating an
+    environment variable with this name and setting it to the desired path.
 
     For more information, see the manual available in HTML and PDF in your
     installation, or online at http://ipython.org/documentation.html.

IPython/frontend/terminal/embed.py

@@ -1,4 +1,3 b''
-#!/usr/bin/env python
 # encoding: utf-8
 """
 An embedded IPython shell.

IPython/frontend/terminal/ipapp.py

@@ -372,4 +372,3 b' def launch_new_instance():'
 
 if __name__ == '__main__':
     launch_new_instance()
-

IPython/lib/irunner.py

@@ -403,10 +403,6 b' interact with IPython at the end of the script (instead of exiting).'
 
 The already implemented runners are listed below; adding one for a new program
 is a trivial task, see the source for examples.
-
-WARNING: the SAGE runner only works if you manually configure your SAGE copy
-to use 'colors NoColor' in the ipythonrc config file, since currently the
-prompt matching regexp does not identify color sequences.
 """
 
 def main():

IPython/lib/pylabtools.py

@@ -101,7 +101,8 b" def print_figure(fig, fmt='png'):"
     try:
         string_io = StringIO()
         # use 72 dpi to match QTConsole's dpi
-        fig.canvas.print_figure(string_io, format=fmt, dpi=72)
+        fig.canvas.print_figure(string_io, format=fmt, dpi=72,
+                                bbox_inches='tight')
         data = string_io.getvalue()
     finally:
         fig.set_facecolor(fc)

docs/man/ipython.1

@@ -2,7 +2,7 b''
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH IPYTHON 1 "November 30, 2004"
+.TH IPYTHON 1 "July 15, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -22,15 +22,15 b''
 .\" To preview this page as plain text: nroff -man ipython.1
 .\"
 .SH NAME
-ipython \- An Enhanced Interactive Python
+ipython \- Tools for Interactive Computing in Python.
 .SH SYNOPSIS
 .B ipython
 .RI [ options ] " files" ...
 .SH DESCRIPTION
-An interactive Python shell with automatic history (input and output),
-dynamic object introspection, easier configuration, command
-completion, access to the system shell, integration with numerical and
-scientific computing tools, and more.
+An interactive Python shell with automatic history (input and output), dynamic
+object introspection, easier configuration, command completion, access to the
+system shell, integration with numerical and scientific computing tools, and
+more.
 .
 .SH REGULAR OPTIONS
 All options that take values, must be of the form '\-\-name=value', but

docs/man/irunner.1

@@ -1,4 +1,4 b''
-.TH IRUNNER 1 "April 24, 2007" "" ""
+.TH IRUNNER 1 "July 15, 2011" "" ""
 .SH NAME
 \fBirunner \- interactive runner interface
 .SH SYNOPSIS

docs/man/pycolor.1

@@ -2,7 +2,7 b''
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH PYCOLOR 1 "May 12, 2007"
+.TH PYCOLOR 1 "July 15, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -30,9 +30,10 b' given, or the file name - is given) to standard out.'
 Output a brief help message.
 .TP
 .B \-s, \-\-scheme <scheme>
-Give the color scheme to use.  Currently only Linux (default),
-LightBG, and NOColor are implemented.
+Give the color scheme to use.  Currently only Linux (default), LightBG, and
+NoColor are implemented.
 .SH AUTHOR
-pycolor was written by Fernando Perez <[e-mail]>.
+pycolor is part of the IPython project (http://ipython.org).
 This manual page was written by Jack Moffitt <[e-mail]>,
-for the Debian project (but may be used by others).
+for the Debian project (but may be used by others).  Updated by Fernando Perez
+<[e-mail]>.