From e1dec352ad5cbe7583838504a5fa63ce712410b2 Mon Sep 17 00:00:00 2001
From: Deepti Navale <dnavale@redhat.com>
Date: Tue, 11 Mar 2014 12:06:52 +1000
Subject: [PATCH] Updates to 'Manage flavors' section in Admin User Guide

Updates to the Admin User guide section 'Manage flavors' in the dashboard
chapter.
Partial-Bug: #1279133

Change-Id: I868a0b530ed78e02cc088a02ba29af012417ee36
---
 ...section_dashboard_admin_manage_flavors.xml | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml b/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml
index 1bda26a67e..a03d4a52d0 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml
@@ -85,10 +85,19 @@
                     <para>ID</para>
                 </td>
                 <td>
-                    <para>The flavor ID, generated by
-                        OpenStack.</para>
+                <para>The flavor ID is generated by OpenStack if the option
+                  selected is <guilabel>auto</guilabel>.</para>
+                <para>By default, this field is set to <guilabel>auto</guilabel>.</para>
                 </td>
             </tr>
+            <tr>
+              <td>
+                <para>Public</para>
+              </td>
+              <td>
+                <para>Indicates if the flavor is public.</para>
+                </td>
+              </tr>
         </tbody>
     </table>
     <para>The default flavors are:</para>
@@ -133,6 +142,12 @@
                 <informaltable rules="all" width="75%">
                     <col width="25%"/>
                     <col width="75%"/>
+                    <thead>
+                      <tr>
+                        <th colspan="2" align="center">
+                          <guilabel>Flavor Info</guilabel> tab</th>
+                    </tr>
+                    </thead>
                     <tbody>
                         <tr>
                             <td>
@@ -142,6 +157,16 @@
                                 <para>Enter the flavor name.</para>
                             </td>
                         </tr>
+                        <tr>
+                          <td>
+                          <para>
+                            <guilabel>ID</guilabel>
+                          </para>
+                        </td>
+                        <td>
+                          <para>The flavor ID, generated by OpenStack.</para>
+                            </td>
+                        </tr>
                         <tr>
                             <td>
                                 <para><guilabel>VCPUs</guilabel></para>
@@ -153,8 +178,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <para><guilabel>RAM
-                                   MB</guilabel></para>
+                                <para><guilabel>RAM MB</guilabel></para>
                             </td>
                             <td>
                                 <para>Enter the amount of RAM to use,
@@ -163,8 +187,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <para><guilabel>Root Disk
-                                   GB</guilabel></para>
+                                <para><guilabel>Root Disk GB</guilabel></para>
                             </td>
                             <td>
                                 <para>Enter the mount of disk space in
@@ -174,8 +197,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <para><guilabel>Ephemeral Disk
-                                   GB</guilabel></para>
+                                <para><guilabel>Ephemeral Disk GB</guilabel></para>
                             </td>
                             <td>
                                 <para>Enter the amount of disk space
@@ -194,8 +216,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <para><guilabel>Swap Disk
-                                   GB</guilabel></para>
+                                <para><guilabel>Swap Disk MB</guilabel></para>
                             </td>
                             <td>
                                 <para>Enter the amount of swap space
@@ -206,6 +227,15 @@
                         </tr>
                     </tbody>
                 </informaltable>
+              </step>
+              <step>
+                <para>In the <guilabel>Flavor Access</guilabel> tab, you can
+                  control access to the flavor by moving projects from the
+                  <guilabel>All Projects</guilabel> column to the <guilabel>Selected
+                    Projects</guilabel> column.</para>
+                    <para>Only projects in the <guilabel>Selected Projects</guilabel>
+                    column can use the flavor. If there are no projects in the
+                    right column, all projects can use the flavor.</para>
             </step>
             <step>
                 <para>Click <guibutton>Create