Merge "Add hypervisor docs"

2 files changed, 37 insertions, 1 deletions

diff --git a/doc/source/command-objects/hypervisor.rst b/doc/source/command-objects/hypervisor.rst
new file mode 100644
index 00000000..d6d0469b
--- /dev/null
+++ b/doc/source/command-objects/hypervisor.rst
@@ -0,0 +1,36 @@
+==========
+hypervisor
+==========
+
+Compute v2
+
+hypervisor list
+---------------
+
+List hypervisors
+
+.. program:: hypervisor list
+.. code:: bash
+
+    os hypervisor list
+        [--matching <hostname>]
+
+.. option:: --matching <hostname>
+
+    Filter hypervisors using <hostname> substring
+
+hypervisor show
+---------------
+
+Display hypervisor details
+
+.. program:: hypervisor show
+.. code:: bash
+
+    os hypervisor show
+        <hypervisor>
+
+.. _hypervisor_show-flavor:
+.. describe:: <hypervisor>
+
+    Hypervisor to display (name or ID)
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 6dbaf117..b621f8c8 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -87,7 +87,7 @@ referring to both Compute and Volume quotas.
 * ``flavor``: (**Compute**) predefined server configurations: ram, root disk, etc
 * ``group``: (**Identity**) a grouping of users
 * ``host``: Compute - the physical computer running a hypervisor
-* ``hypervisor``: Compute - the virtual machine manager
+* ``hypervisor``: (**Compute**) the virtual machine manager
 * ``identity provider``: (**Identity**) a source of users and authentication
 * ``image``: (**Image**) a disk image
 * ``ip fixed``: Compute, Network - an internal IP address assigned to a server