diff --git a/doc/ChangeLog b/doc/ChangeLog index 6a17f31..5622fb8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2008-06-03 Ville Vainio + + * ipython.rst, ipython.1: remove -twisted from man page, + add -pydb to both man page and manual. + +2008-05-31 Fernando Perez + + * IPython/ipmaker.py (make_IPython): The -twisted option is fully + disabled. + 2008-05-31 *** Released version 0.8.4 2008-05-31 Fernando Perez diff --git a/doc/ipython.1 b/doc/ipython.1 index 5b11cf7..024911d 100644 --- a/doc/ipython.1 +++ b/doc/ipython.1 @@ -36,7 +36,7 @@ The following special options are ONLY valid at the beginning of the command line, and not later. This is because they control the initialization of ipython itself, before the normal option-handling mechanism is active. .TP -.B \-gthread, \-qthread, \-q4thread, \-wthread, \-pylab, \-twisted +.B \-gthread, \-qthread, \-q4thread, \-wthread, \-pylab Only ONE of these can be given, and it can only be given as the first option passed to IPython (it will have no effect in any other position). They provide threading support for the GTK, QT3, QT4 and WXWidgets toolkits, for the @@ -56,10 +56,6 @@ request a specific version of wx to be used. This requires that you have the distributions. .br .sp 1 -If \-twisted is given, IPython start a Twisted reactor and runs IPython mainloop -in a dedicated thread, passing commands to be run inside the Twisted reactor. -.br -.sp 1 If \-pylab is given, IPython loads special support for the matplotlib library (http://matplotlib.sourceforge.net), allowing interactive usage of any of its backends as defined in the user's .matplotlibrc file. It automatically @@ -245,6 +241,10 @@ you are used to debugging using pdb, this puts you automatically inside of it after any call (either in IPython or in code called by it) which triggers an exception which goes uncaught. .TP +.B \-pydb +Makes IPython use the third party "pydb" package as debugger, +instead of pdb. Requires that pydb is installed. +.TP .B \-[no]pprint IPython can optionally use the pprint (pretty printer) module for displaying results. pprint tends to give a nicer display of nested diff --git a/doc/source/ipython.rst b/doc/source/ipython.rst index b34cf00..c2f58d6 100644 --- a/doc/source/ipython.rst +++ b/doc/source/ipython.rst @@ -1227,6 +1227,10 @@ All options with a [no] prepended can be specified in negated form IPython or in code called by it) which triggers an exception which goes uncaught. + -pydb + Makes IPython use the third party "pydb" package as debugger, + instead of pdb. Requires that pydb is installed. + -[no]pprint ipython can optionally use the pprint (pretty printer) module for displaying results. pprint tends to give a nicer display