Some more documentation cleanups and reorgs

docs/CLI.rst

-pyrasite - A command-line interface for injecting code into running Python processes
+pyrasite - A command-line interface for injecting code into a running Python process
 ====================================================================================
 
 ::
@@ -19,28 +19,4 @@ pyrasite - A command-line interface for injecting code into running Python proce
 
     For updates, visit https://github.com/lmacken/pyrasite
 
-
-pyrasite-shell
---------------
-
-You can easily open up a shell and execute commands in a running process using
-the `pyrasite-shell`.
-
-.. code-block:: bash
-
-   $ pyrasite-shell
-   Usage: pyrasite-shell <PID>
-
-.. code-block:: bash
-
-   $ pyrasite-shell $(pgrep -f "python -v")
-   Pyrasite Shell 2.0beta7
-   Python 2.7.2 (default, Oct 27 2011, 01:40:22) 
-   [GCC 4.6.1 20111003 (Red Hat 4.6.1-10)] on linux2
-   
-   >>> print(x)
-   foo
-   
-   >>> globals()['x'] = 'bar'
-
 .. seealso:: :doc:`Payloads`

docs/Payloads.rst

@@ -5,9 +5,7 @@ Reverse Python Shell
 --------------------
 
 .. deprecated:: 2.0
-   Use the `pyrasite-shell
-   <http://readthedocs.org/docs/pyrasite/en/latest/CLI.html#pyrasite-shell>`_
-   tool instead.
+   Use the `pyrasite-shell <http://readthedocs.org/docs/pyrasite/en/latest/Shell.html>`_ instead
 
 This lets you easily introspect or alter any objects in your running process.
 
@@ -67,8 +65,8 @@ installed.
 .. image:: http://lewk.org/img/pyrasite-memory-viewer.png
 
 
-Reverse Shell
--------------
+Reverse Subprocess Shell
+------------------------
 
 .. literalinclude:: ../pyrasite/payloads/reverse_shell.py
    :language: python

docs/Shell.rst

+pyrasite-shell - Give it a pid, get a shell
+===========================================
+
+You can easily drop into a shell and execute commands in a running process
+using the ``pyrasite-shell``.
+
+.. code-block:: bash
+
+   $ pyrasite-shell
+   Usage: pyrasite-shell <PID>
+
+.. code-block:: bash
+
+   $ pyrasite-shell $(pgrep -f "python -v")
+   pyrasite shell 2.0beta7
+   Python 2.7.2 (default, Oct 27 2011, 01:40:22) 
+   [GCC 4.6.1 20111003 (Red Hat 4.6.1-10)] on linux2
+   
+   >>> print(x)
+   foo
+   
+   >>> globals()['x'] = 'bar'
+
+Source
+------
+
+.. literalinclude:: ../pyrasite/tools/shell.py
+   :language: python
+   :start-after: Copyright

docs/index.rst

@@ -14,10 +14,11 @@ Contents
 ---------
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    Installing
-   GUI
    CLI
+   Shell
+   GUI
    Payloads
    API