From 80afa027aa3cbb6731a2469930ea843f6c72bf39 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Sun, 2 Feb 2014 10:07:40 +0100
Subject: [PATCH] Fix formatting and output of 'nova help'

Update the 'nova help' output samples with the latest client version in
the cloud admin guide.

Change-Id: I24e64fc1192e485b3bd7e374cf11afdbacfcb7e6
---
 doc/admin-guide-cloud/ch_compute.xml          | 20 +++++++++++++------
 .../section_cli_nova_customize_flavors.xml    | 19 +++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml
index 6e7ddfc8fd..b39429858a 100644
--- a/doc/admin-guide-cloud/ch_compute.xml
+++ b/doc/admin-guide-cloud/ch_compute.xml
@@ -1872,12 +1872,20 @@ net.bridge.bridge-nf-call-ip6tables=0</programlisting>
                     <para>Now that you have installed the
                         python-novaclient, confirm the installation by
                         entering:</para>
-                    <screen><prompt>$</prompt> <userinput>nova help</userinput><computeroutput>usage: nova [--debug] [--os-username OS_USERNAME] [--os-password OS_PASSWORD]
-[--os-tenant-name_name OS_TENANT_NAME] [--os-auth-url OS_AUTH_URL]
-[--os-region-name OS_REGION_NAME] [--service-type SERVICE_TYPE]
-[--service-name SERVICE_NAME] [--endpoint-type ENDPOINT_TYPE]
-[--version VERSION]
-&lt;subcommand&gt; ...</computeroutput></screen>
+                    <screen><prompt>$</prompt> <userinput>nova help</userinput>
+<computeroutput>usage: nova [--version] [--debug] [--os-cache] [--timings]
+            [--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;auth-tenant-id&gt;] [--os-auth-url &lt;auth-url&gt;]
+            [--os-region-name &lt;region-name&gt;] [--os-auth-system &lt;auth-system&gt;]
+            [--service-type &lt;service-type&gt;] [--service-name &lt;service-name&gt;]
+            [--volume-service-name &lt;volume-service-name&gt;]
+            [--endpoint-type &lt;endpoint-type&gt;]
+            [--os-compute-api-version &lt;compute-api-ver&gt;]
+            [--os-cacert &lt;ca-certificate&gt;] [--insecure]
+            [--bypass-url &lt;bypass-url&gt;]
+            &lt;subcommand&gt; ...</computeroutput></screen>
                 </step>
                 <step>
                     <para>This command returns a list of nova commands
diff --git a/doc/common/section_cli_nova_customize_flavors.xml b/doc/common/section_cli_nova_customize_flavors.xml
index cd89347674..d53f62dc9e 100644
--- a/doc/common/section_cli_nova_customize_flavors.xml
+++ b/doc/common/section_cli_nova_customize_flavors.xml
@@ -7,17 +7,16 @@
     <para>Authorized users can use the <command>nova
             flavor-create</command> command to create flavors. To see
         the available flavor-related commands, run:</para>
-    <screen><prompt>$</prompt> <userinput>nova help | grep flavor</userinput>
-<computeroutput>flavor-access-add   Add flavor access for the given tenant.
-flavor-access-list  Print access information about the given flavor.
-flavor-access-remove
+    <screen><prompt>$</prompt> <userinput>nova help | grep flavor-</userinput>
+<computeroutput>    flavor-access-add   Add flavor access for the given tenant.
+    flavor-access-list  Print access information about the given flavor.
+    flavor-access-remove
                     Remove flavor access for the given tenant.
-flavor-create       Create a new flavor
-flavor-delete       Delete a specific flavor
-flavor-key          Set or unset extra_spec for a flavor.
-flavor-list         Print a list of available 'flavors' (sizes of
-flavor-show         Show details about the given flavor.
-volume-type-delete  Delete a specific flavor</computeroutput></screen>
+    flavor-create       Create a new flavor
+    flavor-delete       Delete a specific flavor
+    flavor-key          Set or unset extra_spec for a flavor.
+    flavor-list         Print a list of available 'flavors' (sizes of
+    flavor-show         Show details about the given flavor.</computeroutput></screen>
     <note>
         <para>To modify an existing flavor in the dashboard, you must
             delete the flavor and create a modified one with the same