diff options
| author | Tres Seaver <tseaver@palladion.com> | 2013-03-03 12:40:05 -0800 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2013-03-03 12:40:05 -0800 |
| commit | 03e3bac29414bc64d2de317c9e167f0b864c5c3f (patch) | |
| tree | d8610958bfdf2338b5392ec61dfa51fe0b54ff38 /docs/narr/commandline.rst | |
| parent | e84477b03f0f6c4577abd51fa51f69f1224fa99e (diff) | |
| parent | ca402b50f2440b3ab7d7e0d9d058e72c20e9948b (diff) | |
| download | pyramid-03e3bac29414bc64d2de317c9e167f0b864c5c3f.tar.gz pyramid-03e3bac29414bc64d2de317c9e167f0b864c5c3f.tar.bz2 pyramid-03e3bac29414bc64d2de317c9e167f0b864c5c3f.zip | |
Merge pull request #868 from tshepang/grammar
simplify sentence and fix its grammar
Diffstat (limited to 'docs/narr/commandline.rst')
| -rw-r--r-- | docs/narr/commandline.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 0a5feafc4..48df6b9a8 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -276,10 +276,10 @@ exposed, and the request is configured to generate urls from the host IPython or bpython ~~~~~~~~~~~~~~~~~~ -If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ or -`bpython <http://bpython-interpreter.org/>`_ or both installed in +If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ and/or +`bpython <http://bpython-interpreter.org/>`_ in the interpreter you use to invoke the ``pshell`` command, ``pshell`` will -autodiscover them and use the first respectively found in this order : +autodiscover and use the first one 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. |