From 2cf5d280866e8936b0fee0952c89ebde164337ee Mon Sep 17 00:00:00 2001
From: Jean-Philippe Camguilhem <jp.camguilhem@gmail.com>
Date: Tue, 22 Nov 2011 00:20:07 +0100
Subject: add bpython support to pshell with raydeo remarks and design

---
 docs/narr/commandline.rst | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'docs')

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index dc2b75ed6..0f0e17ca6 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -268,34 +268,22 @@ exposed, and the request is configured to generate urls from the host
 
 .. index::
    single: IPython
+   single: bpython
 
-IPython
-~~~~~~~
-
-If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ installed in
-the interpreter you use to invoke the ``pshell`` command, ``pshell`` will use
-an IPython interactive shell instead of a standard Python interpreter shell.
-If you don't want this to happen, even if you have IPython installed, you can
-pass the ``--disable-ipython`` flag to the ``pshell`` command to use a
-standard Python interpreter shell unconditionally.
-
-.. code-block:: text
-
-   [chrism@vitaminf shellenv]$ ../bin/pshell --disable-ipython \
-                                development.ini#MyProject
-
-
-bpython
-~~~~~~~
+IPython or bpython
+~~~~~~~~~~~~~~~~~~
 
-If you have `bpython <http://bpython-interpreter.org/>`_ installed in
-the interpreter you use to invoke the ``pshell`` command, ``pshell`` will use
-a bpython interactive shell instead of a standard Python if you pass the ``-b`` 
-or ``--enable-bpython`` flag to the ``pshell`` command.
+If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ or 
+`bpython <http://bpython-interpreter.org/>`_ or both installed in
+the interpreter you use to invoke the ``pshell`` command, ``pshell`` will 
+autodiscover them and use the first respectively found in this order :
+IPython, bpython, standard Python interpreter. However you could 
+specifically invoke one of your choice with the ``-p choice`` or 
+``--python-shell choice`` option.
 
 .. code-block:: text
 
-   [chrism@vitaminf shellenv]$ ../bin/pshell --enable-bpython \
+   [chrism@vitaminf shellenv]$ ../bin/pshell -p ipython | bpython | python \
                                 development.ini#MyProject
 
 .. index::
-- 
cgit v1.2.3