5 files changed, 58 insertions, 5 deletions
diff --git a/doc/source/command-objects/hypervisor-stats.rst b/doc/source/command-objects/hypervisor-stats.rst
new file mode 100644
index 00000000..06edf7a1
--- /dev/null
+++ b/doc/source/command-objects/hypervisor-stats.rst
@@ -0,0 +1,16 @@
+================
+hypervisor stats
+================
+
+Compute v2
+
+hypervisor stats show
+---------------------
+
+Display hypervisor stats details
+
+.. program:: hypervisor stats show
+.. code:: bash
+
+    os hypervisor stats show
+
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/command-objects/server.rst b/doc/source/command-objects/server.rst
index ee6416fc..34555580 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -423,16 +423,16 @@ Scale server to a new flavor
         <server>
 
     os server resize
-        --verify | --revert
+        --confirm | --revert
         <server>
 
 .. option:: --flavor <flavor>
 
     Resize server to specified flavor
 
-.. option:: --verify
+.. option:: --confirm
 
-    Verify server resize is complete
+    Confirm server resize is complete
 
 .. option:: --revert
 
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 6dbaf117..42d041af 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -87,7 +87,8 @@ 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
+* ``hypervisor stats``: (**Compute**) hypervisor statistics over all compute nodes
 * ``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
diff --git a/doc/source/man/openstack.rst b/doc/source/man/openstack.rst
index 4a9df34a..a6de54db 100644
--- a/doc/source/man/openstack.rst
+++ b/doc/source/man/openstack.rst
@@ -55,7 +55,7 @@ OPTIONS
 
 :program:`openstack` takes global options that control overall behaviour and command-specific options that control the command operation.  Most global options have a corresponding environment variable that may also be used to set the value. If both are present, the command-line option takes priority. The environment variable names are derived from the option name by dropping the leading dashes ('--'), converting each embedded dash ('-') to an underscore ('_'), and converting to upper case.
 
-:program:`openstack` recognizes the following global topions:
+:program:`openstack` recognizes the following global options:
 
 :option:`--os-auth-plugin` <auth-plugin>
     The authentication plugin to use when connecting to the Identity service. If this option is not set, :program:`openstack` will attempt to guess the authentication method to use based on the other options.