Merge "Sort commands in docs"

Jenkins · openstack-gerrit · commit e49c3f6682a3 · 2016-03-14T22:27:53.000Z
diff --git a/doc/source/command-objects/flavor.rst b/doc/source/command-objects/flavor.rst
@@ -118,22 +118,6 @@ List flavors
 
     Maximum number of flavors to display
 
-flavor show
------------
-
-Display flavor details
-
-.. program:: flavor show
-.. code:: bash
-
-    os flavor show
-        <flavor>
-
-.. _flavor_show-flavor:
-.. describe:: <flavor>
-
-    Flavor to display (name or ID)
-
 flavor set
 ----------
 
@@ -154,6 +138,22 @@ Set flavor properties
 
     Flavor to modify (name or ID)
 
+flavor show
+-----------
+
+Display flavor details
+
+.. program:: flavor show
+.. code:: bash
+
+    os flavor show
+        <flavor>
+
+.. _flavor_show-flavor:
+.. describe:: <flavor>
+
+    Flavor to display (name or ID)
+
 flavor unset
 ------------
 
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
@@ -4,6 +4,33 @@ image
 
 Image v1, v2
 
+image add project
+-----------------
+
+*Only supported for Image v2*
+
+Associate project with image
+
+.. program:: image add project
+.. code:: bash
+
+    os image add project
+        [--project-domain <project-domain>]
+        <image> <project>
+
+.. option:: --project-domain <project-domain>
+
+    Domain the project belongs to (name or ID).
+    This can be used in case collisions between project names exist.
+
+.. describe:: <image>
+
+    Image to share (name or ID).
+
+.. describe:: <project>
+
+    Project to associate with image (name or ID)
+
 image create
 ------------
 
@@ -206,6 +233,33 @@ List available images
     The last image (name or ID) of the previous page. Display list of images
     after marker. Display all images if not specified.
 
+image remove project
+--------------------
+
+*Only supported for Image v2*
+
+Disassociate project with image
+
+.. program:: image remove project
+.. code:: bash
+
+    os image remove remove
+        [--project-domain <project-domain>]
+        <image> <project>
+
+.. option:: --project-domain <project-domain>
+
+    Domain the project belongs to (name or ID).
+    This can be used in case collisions between project names exist.
+
+.. describe:: <image>
+
+    Image to unshare (name or ID).
+
+.. describe:: <project>
+
+    Project to disassociate with image (name or ID)
+
 image save
 ----------
 
@@ -445,57 +499,3 @@ Display image details
 .. describe:: <image>
 
     Image to display (name or ID)
-
-image add project
------------------
-
-*Only supported for Image v2*
-
-Associate project with image
-
-.. program:: image add project
-.. code:: bash
-
-    os image add project
-        [--project-domain <project-domain>]
-        <image> <project>
-
-.. option:: --project-domain <project-domain>
-
-    Domain the project belongs to (name or ID).
-    This can be used in case collisions between project names exist.
-
-.. describe:: <image>
-
-    Image to share (name or ID).
-
-.. describe:: <project>
-
-    Project to associate with image (name or ID)
-
-image remove project
---------------------
-
-*Only supported for Image v2*
-
-Disassociate project with image
-
-.. program:: image remove project
-.. code:: bash
-
-    os image remove remove
-        [--project-domain <project-domain>]
-        <image> <project>
-
-.. option:: --project-domain <project-domain>
-
-    Domain the project belongs to (name or ID).
-    This can be used in case collisions between project names exist.
-
-.. describe:: <image>
-
-    Image to unshare (name or ID).
-
-.. describe:: <project>
-
-    Project to disassociate with image (name or ID)
