Minor organization tweaks. Expanded table of contents to two levels to improve navigation

Nathan Beittenmiller · Nathan Beittenmiller · commit 3f31da6f5633 · 2013-08-06T08:15:15.000-05:00
diff --git a/docs/api/client.rst b/docs/api/client.rst
@@ -49,9 +49,24 @@ Below is an example of creating a client instance with more options. This will c
             verbose=True,
         )
 
+Managers
+--------
+::
+For day to day operation, most users will find the managers to be the most convenient means for interacting with the API. Managers mask out a lot of the complexities of using the API into classes that provide a simpler interface to various services. These are higher-level interfaces to the SoftLayer API.
+
+
+	>>> from SoftLayer import CCIManager, Client
+	>>> client = Client(...)
+	>>> cci = CCIManager(client)
+	>>> cci.list_instances()
+	[...]
+
+If you need more power or functionality than the managers provide, you can make direct API calls as well.
+
+
 Making API Calls
 ----------------
-The SoftLayer API client for python leverages SoftLayer's XML-RPC API. It supports authentication, object masks, object filters, limits, offsets, and retrieving objects by id. The following section assumes you have a initialized client named 'client'.
+For full control over your account and services, you can directly call the SoftLayer API. The SoftLayer API client for python leverages SoftLayer's XML-RPC API. It supports authentication, object masks, object filters, limits, offsets, and retrieving objects by id. The following section assumes you have a initialized client named 'client'.
 
 The best way to test our setup is to call the `getObject <http://sldn.softlayer.com/reference/services/SoftLayer_Account/getObject>`_ method on the `SoftLayer_Account <http://sldn.softlayer.com/reference/services/SoftLayer_Account>`_ service.
 ::
@@ -135,18 +150,6 @@ API Reference
    :undoc-members:
 
 
-Managers
---------
-::
-
-	>>> from SoftLayer import CCIManager, Client
-	>>> client = Client(...)
-	>>> cci = CCIManager(client)
-	>>> cci.list_instances()
-	[...]
-
-Managers mask out a lot of the complexities of using the API into classes that provide a simpler interface to various services. These are higher-level interfaces to the SoftLayer API.
-
 .. toctree::
    :maxdepth: 2
    :glob:
diff --git a/docs/cli.rst b/docs/cli.rst
@@ -69,24 +69,29 @@ To discover the available commands, simply type `sl`.
 ::
 
 	$ sl
-	usage: sl <command> [<args>...]
-	       sl help <command>
+	usage: sl <module> [<args>...]
+	       sl help <module>
+	       sl help <module> <command>
 	       sl [-h | --help]
-
+	
 	SoftLayer Command-line Client
-
-	The available commands are:
-	  firewall  Firewall rule and security management
-	  image     Manages compute and flex images
-	  ssl       Manages SSL
+	
+	The available modules are:
 	  cci       Manage, delete, order compute instances
-	  dns       Manage DNS
 	  config    View and edit configuration for this tool
+	  dns       Manage DNS
+	  firewall  Firewall rule and security management
+	  hardware  View hardware details
+	  bmetal    Interact with bare metal instances
+	  network   Perform various network operations
+	  help      Show help
+	  iscsi     View iSCSI details
+	  image     Manages compute and flex images
 	  metadata  Get details about this machine. Also available with 'my' and 'meta'
 	  nas       View NAS details
-	  iscsi     View iSCSI details
+	  ssl       Manages SSL
 
-	See 'sl help <command>' for more information on a specific command.
+	See 'sl help <module>' for more information on a specific module.
 
 	To use most commands your SoftLayer username and api_key need to be configured.
 	The easiest way to do that is to use: 'sl config setup'
diff --git a/docs/index.rst b/docs/index.rst
@@ -5,7 +5,7 @@ SoftLayer API Python Client |version|
 This is the documentation to SoftLayer's Python API Bindings. These bindings use SoftLayer's `XML-RPC interface <http://sldn.softlayer.com/article/XML-RPC>`_ in order to manage SoftLayer services.
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :glob:
 
    install
