Small updates to Debian man pages for 0.10.

Mostly fixes to ipcluster's man page, since ipcluster changed a bit for
0.10.  Other small updates to make them accurate for 0.10.

docs/man/ipcluster.1

@@ -4,48 +4,38 b''
 .SH SYNOPSIS
 .nf
 .fam C
-\fBipcluster\fP [\fIoptions\fP]
+\fBipcluster\fP {\fmpiexec,local,mpirun,pbs,ssh\fP} [\fIoptions\fP]
 .fam T
 .fi
 .SH DESCRIPTION
 ipcluster is a control tool for IPython's parallel computing functions.
+
+IPython cluster startup. This starts a controller and engines using various
+approaches. Use the IPYTHONDIR environment variable to change your IPython
+directory from the default of .ipython or _ipython. The log and security
+subdirectories of your IPython directory will be used by this script for log
+files and security files.
+.SH POSITIONAL ARGUMENTS
+
+The first positional argument should be one of: {mpiexec, local, mpirun, pbs,
+ssh}, which are the available cluster types.
+
+For detailed help on each, type "ipcluster TYPE --help". Briefly:
+
+  local         run a local cluster
+  mpirun        run a cluster using mpirun (mpiexec also works)
+  mpiexec       run a cluster using mpiexec (mpirun also works)
+  pbs           run a pbs cluster
+  ssh           run a cluster using ssh, should have ssh-keys setup
 .SH OPTIONS
 .TP
 .B
 \-h, \-\-help
-show this help message and exit
-.TP
-.B
-\-\-controller\-port=CONTROLLERPORT
-the TCP port the controller is listening on
-.TP
-.B
-\-\-controller\-ip=CONTROLLERIP
-the TCP IP address of the controller
-.TP
-.B
-\-n, \-\-num=N
-the number of engines to start
-.TP
-.B
-\-\-engine\-port=ENGINEPORT
-the TCP port the controller will listen on for engine connections
-.TP
-.B
-\-\-mpi=MPI
-use mpi with package: for instance --mpi=mpi4py
-.TP
-.B
-\-l LOGFILE, \-\-logfile=LOGFILE
-log file name
-.TP
-.B
-\-f CLUSTERFILE, \-\-cluster\-file=CLUSTERFILE
-file describing a remote cluster
+show help message and exit
 .SH EXAMPLE
-ipcluster -n 4
+ipcluster local -n 4
 
-This command will start 4 IPython engines.
+This command will start 4 IPython engines on the local computer.
 .SH SEE ALSO
 .BR ipython(1), ipcontroller(1), ipengine(1)
 .br
@@ -54,4 +44,5 b' This command will start 4 IPython engines.'
 the IPython Development Team.
 .PP
 This manual page was written by Stephan Peijnik <[e-mail]>,
-for the Debian project (but may be used by others).
+for the Debian project (but may be used by others).  Modified by Fernando Perez
+<[e-mail]> for inclusion in IPython.

docs/man/ipcontroller.1

@@ -73,8 +73,8 b' file to store the FURL for engines to connect with'
 log file name (default is stdout)
 .TP
 .B
-\-\-ipythondir=IPYTHONDIR
-look for config files and profiles in this directory
+\-r
+try to reuse all furl files
 .SH SEE ALSO
 .BR ipython(1), ipcluster(1), ipengine(1)
 .br
@@ -83,4 +83,5 b' look for config files and profiles in this directory'
 the IPython Development Team.
 .PP
 This manual page was written by Stephan Peijnik <[e-mail]>,
-for the Debian project (but may be used by others).
+for the Debian project (but may be used by others).  Modified by Fernando Perez
+<[e-mail]> for inclusion in IPython.

docs/man/ipengine.1

@@ -26,10 +26,6 b' How to enable MPI (mpi4py, pytrilions, or empty string to disable)'
 .B
 \-l LOGFILE, \-\-logfile=LOGFILE
 log file name (defaults to stdout)
-.TP
-.B
-\-\-ipythondir=IPYTHONDIR
-look for config files and profiles in this directory
 .SH SEE ALSO
 .BR ipython(1), ipcluster(1), ipcontroller(1)
 .br
@@ -38,4 +34,5 b' look for config files and profiles in this directory'
 the IPython Development Team.
 .PP
 This manual page was written by Stephan Peijnik <[e-mail]>,
-for the Debian project (but may be used by others).
+for the Debian project (but may be used by others).  Modified by Fernando Perez
+<[e-mail]> for inclusion in IPython.

docs/man/irunner.1

@@ -39,14 +39,11 b' irunner.py \\-\\-ipython \\-\\- \\-\\-interact script.ipy'
 .SH SEE ALSO
 .BR ipython(1)
 .br
-.SH BUGS
-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.
 .SH AUTHOR
 \fBirunner\fP is an extension of Ken Schutte <kschutte-AT-csail.mit.edu>'s
 script contributed on the ipython-user list:
 http://scipy.net/pipermail/ipython-user/2006-May/001705.html
 .PP
-This manual page was written by Bernd Zeimetz <[e-mail]>,
-for the Debian project (but may be used by others).
+This manual page was written by Bernd Zeimetz <[e-mail]>, for the Debian
+project (but may be used by others).  Modified by Fernando Perez
+<[e-mail]> for inclusion in IPython.