update plugin documentation

- add watcher, gnocchi and aodh
- organize sphinx docs based on alphabetical order
  of the library

Change-Id: Ibdd500da0e488ce3256320d53b3354ee7c66468a

2 files changed, 44 insertions, 18 deletions

diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst
index b23e7a33..66e1d72c 100644
--- a/doc/source/plugin-commands.rst
+++ b/doc/source/plugin-commands.rst
@@ -6,51 +6,76 @@ Note: To see the complete syntax for the plugin commands, see the `CLI_Ref`_
 
 .. list-plugins:: openstack.cli.extension
 
-.. list-plugins:: openstack.key_manager.v1
+# aodh
+.. list-plugins:: openstack.alarming.v2
    :detailed:
 
-.. list-plugins:: openstack.baremetal.v1
+# barbican
+.. list-plugins:: openstack.key_manager.v1
    :detailed:
 
+# congress
 .. list-plugins:: openstack.congressclient.v1
    :detailed:
 
-.. list-plugins:: openstack.workflow_engine.v2
-   :detailed:
+# cue
+.. # cueclient is not in global-requirements
+.. # list-plugins:: openstack.mb.v1
+.. #   :detailed:
 
-.. list-plugins:: openstack.data_processing.v1
+# designate
+.. list-plugins:: openstack.dns.v1
    :detailed:
 
-.. list-plugins:: openstack.dns.v1
+# gnocchi
+.. # gnocchiclient is not in global-requirements
+.. # list-plugins:: openstack.metric.v1
+.. #  :detailed:
+
+# heat
+.. list-plugins:: openstack.orchestration.v1
    :detailed:
 
-.. list-plugins:: openstack.management.v1
+# ironic
+.. list-plugins:: openstack.baremetal.v1
    :detailed:
 
-.. list-plugins:: openstack.messaging.v1
+# ironic-inspector
+.. list-plugins:: openstack.baremetal_introspection.v1
    :detailed:
 
-.. list-plugins:: openstack.orchestration.v1
+# mistral
+.. list-plugins:: openstack.workflow_engine.v2
    :detailed:
 
-.. list-plugins:: openstack.search.v1
+# murano
+.. list-plugins:: openstack.application_catalog.v1
    :detailed:
 
-.. list-plugins:: openstack.baremetal_introspection.v1
+# sahara
+.. list-plugins:: openstack.data_processing.v1
    :detailed:
 
-.. list-plugins:: openstack.application_catalog.v1
+# searchlight
+.. list-plugins:: openstack.search.v1
    :detailed:
 
+# senlin
 .. list-plugins:: openstack.clustering.v1
    :detailed:
 
+# tripleo
 .. # tripleoclient is not in global-requirements
-.. #.. list-plugins:: openstack.tripleoclient.v1
+.. # list-plugins:: openstack.tripleoclient.v1
 .. #   :detailed:
 
-.. # cueclient is not in global-requirements
-.. #.. list-plugins:: openstack.mb.v1
-.. #   :detailed:
+# watcher
+.. # watcherclient is not in global-requirements
+.. # list-plugins:: openstack.infra_optim.v1
+.. #  :detailed:
+
+# zaqar
+.. list-plugins:: openstack.messaging.v1
+   :detailed:
 
 .. _CLI_Ref: http://docs.openstack.org/cli-reference/openstack.html
\ No newline at end of file
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index 00aa5137..412edd10 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -21,6 +21,8 @@ OpenStackClient.
 
 The following is a list of projects that are an OpenStackClient plugin.
 
+- aodhclient
+- gnocchiclient\*\*
 - python-barbicanclient
 - python-congressclient
 - python-cueclient\*\*
@@ -34,14 +36,13 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-searchlightclient
 - python-senlinclient
 - python-tripleoclient\*\*
+- python-watcherclient\*\*
 - python-zaqarclient
 
 \*\* Note that some clients are not listed in global-requirements
 
 The following is a list of projects that are not an OpenStackClient plugin.
 
-- aodhclient
-- gnocchiclient
 - python-troveclient
 - python-magnumclient
 - python-ceilometerclient