diff --git a/doc/common/ch_cli_ceilometer_commands.xml b/doc/common/ch_cli_ceilometer_commands.xml
index 8eeb5f35e8..44b364f541 100644
--- a/doc/common/ch_cli_ceilometer_commands.xml
+++ b/doc/common/ch_cli_ceilometer_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="ceilometerclient_command_usage">
        <title>ceilometer usage</title>
-        <screen><computeroutput>                  [--key-file KEY_FILE] [--os-cacert &lt;ca-certificate-file&gt;]
+        <screen><computeroutput>usage: ceilometer [--version] [-d] [-v] [-k] [--cert-file CERT_FILE]
+                  [--key-file KEY_FILE] [--os-cacert &lt;ca-certificate-file&gt;]
                   [--ca-file OS_CACERT] [--timeout TIMEOUT]
                   [--os-username OS_USERNAME] [--os-password OS_PASSWORD]
                   [--os-tenant-id OS_TENANT_ID]
diff --git a/doc/common/ch_cli_cinder_commands.xml b/doc/common/ch_cli_cinder_commands.xml
index 25035e7035..1cc4d83f84 100644
--- a/doc/common/ch_cli_cinder_commands.xml
+++ b/doc/common/ch_cli_cinder_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="cinderclient_command_usage">
        <title>cinder usage</title>
-        <screen><computeroutput>              [--os-password &lt;auth-password&gt;]
+        <screen><computeroutput>usage: cinder [--version] [--debug] [--os-username &lt;auth-user-name&gt;]
+              [--os-password &lt;auth-password&gt;]
               [--os-tenant-name &lt;auth-tenant-name&gt;]
               [--os-tenant-id &lt;auth-tenant-id&gt;] [--os-auth-url &lt;auth-url&gt;]
               [--os-region-name &lt;region-name&gt;] [--service-type &lt;service-type&gt;]
diff --git a/doc/common/ch_cli_glance_commands.xml b/doc/common/ch_cli_glance_commands.xml
index 5cc8d0f5c2..428213756f 100644
--- a/doc/common/ch_cli_glance_commands.xml
+++ b/doc/common/ch_cli_glance_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="glanceclient_command_usage">
        <title>glance usage</title>
-        <screen><computeroutput>              [--cert-file CERT_FILE] [--key-file KEY_FILE]
+        <screen><computeroutput>usage: glance [--version] [-d] [-v] [--get-schema] [-k]
+              [--cert-file CERT_FILE] [--key-file KEY_FILE]
               [--os-cacert &lt;ca-certificate-file&gt;] [--ca-file OS_CACERT]
               [--timeout TIMEOUT] [--no-ssl-compression] [-f] [--dry-run]
               [--ssl] [-H ADDRESS] [-p PORT] [--os-username OS_USERNAME]
diff --git a/doc/common/ch_cli_heat_commands.xml b/doc/common/ch_cli_heat_commands.xml
index 568e16a7e3..1742ec9df4 100644
--- a/doc/common/ch_cli_heat_commands.xml
+++ b/doc/common/ch_cli_heat_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="heatclient_command_usage">
        <title>heat usage</title>
-        <screen><computeroutput>            [--key-file KEY_FILE] [--ca-file CA_FILE] [--timeout TIMEOUT]
+        <screen><computeroutput>usage: heat [--version] [-d] [-v] [-k] [--cert-file CERT_FILE]
+            [--key-file KEY_FILE] [--ca-file CA_FILE] [--timeout TIMEOUT]
             [--os-username OS_USERNAME] [--os-password OS_PASSWORD]
             [--os-tenant-id OS_TENANT_ID] [--os-tenant-name OS_TENANT_NAME]
             [--os-auth-url OS_AUTH_URL] [--os-region-name OS_REGION_NAME]
diff --git a/doc/common/ch_cli_keystone_commands.xml b/doc/common/ch_cli_keystone_commands.xml
index 48c13978cd..35f1a50288 100644
--- a/doc/common/ch_cli_keystone_commands.xml
+++ b/doc/common/ch_cli_keystone_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="keystoneclient_command_usage">
        <title>keystone usage</title>
-        <screen><computeroutput>                [--os-username &lt;auth-user-name&gt;]
+        <screen><computeroutput>usage: keystone [--version] [--timeout &lt;seconds&gt;]
+                [--os-username &lt;auth-user-name&gt;]
                 [--os-password &lt;auth-password&gt;]
                 [--os-tenant-name &lt;auth-tenant-name&gt;]
                 [--os-tenant-id &lt;tenant-id&gt;] [--os-auth-url &lt;auth-url&gt;]
diff --git a/doc/common/ch_cli_neutron_commands.xml b/doc/common/ch_cli_neutron_commands.xml
index 4e0507eabd..1f91a50f2d 100644
--- a/doc/common/ch_cli_neutron_commands.xml
+++ b/doc/common/ch_cli_neutron_commands.xml
@@ -20,7 +20,8 @@
 
     <section xml:id="neutronclient_command_usage">
        <title>neutron usage</title>
-        <screen><computeroutput>               [--os-auth-url &lt;auth-url&gt;]
+        <screen><computeroutput>usage: neutron [--version] [-v] [-q] [-h] [--os-auth-strategy &lt;auth-strategy&gt;]
+               [--os-auth-url &lt;auth-url&gt;]
                [--os-tenant-name &lt;auth-tenant-name&gt;]
                [--os-tenant-id &lt;auth-tenant-id&gt;]
                [--os-username &lt;auth-username&gt;] [--os-password &lt;auth-password&gt;]
diff --git a/doc/common/ch_cli_nova_commands.xml b/doc/common/ch_cli_nova_commands.xml
index d3296c6f33..ac8937ae7f 100644
--- a/doc/common/ch_cli_nova_commands.xml
+++ b/doc/common/ch_cli_nova_commands.xml
@@ -11,7 +11,7 @@
     <title>Compute command-line client</title>
     <para>The <command>nova</command> client is the command-line interface
          (CLI) for the OpenStack Compute API and its extensions. This chapter documents
-         <command>nova</command> version 2.16.0.
+         <command>nova</command> version 2.17.0.
     </para>
     <para>For help on a specific <command>nova</command>
        command, enter:
@@ -20,7 +20,8 @@
 
     <section xml:id="novaclient_command_usage">
        <title>nova usage</title>
-        <screen><computeroutput>            [--timeout &lt;seconds&gt;] [--os-auth-token OS_AUTH_TOKEN]
+        <screen><computeroutput>usage: nova [--version] [--debug] [--os-cache] [--timings]
+            [--timeout &lt;seconds&gt;] [--os-auth-token OS_AUTH_TOKEN]
             [--os-username &lt;auth-user-name&gt;] [--os-password &lt;auth-password&gt;]
             [--os-tenant-name &lt;auth-tenant-name&gt;]
             [--os-tenant-id &lt;auth-tenant-id&gt;] [--os-auth-url &lt;auth-url&gt;]
@@ -868,6 +869,14 @@
       </para>
     </listitem>
   </varlistentry>
+  <varlistentry>
+    <term><command>refresh-network</command></term>
+    <listitem>
+      <para>
+        Refresh server network information.
+      </para>
+    </listitem>
+  </varlistentry>
   <varlistentry>
     <term><command>remove-fixed-ip</command></term>
     <listitem>
@@ -5380,6 +5389,25 @@ Shutdown, re-image, and re-boot a server.
       </para>
     </listitem>
   </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="novaclient_subcommand_refresh-network">
+        <title>nova refresh-network command</title>
+        <screen><computeroutput>usage: nova refresh-network &lt;server&gt;
+        </computeroutput></screen>
+        <para>
+Refresh server network information.
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;server&gt;</command></term>
+    <listitem>
+      <para>
+        Name or ID of a server for which the network cache should be
+      refreshed from neutron (Admin only).
+      </para>
+    </listitem>
+  </varlistentry>
  </variablelist>
     </section>
     <section xml:id="novaclient_subcommand_remove-fixed-ip">