summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-14 22:27:53 +0000
committerGerrit Code Review <review@openstack.org>2016-03-14 22:27:53 +0000
commite49c3f6682a3c59cdee2dad58ab6fe6bb8c170cf (patch)
tree34da6d4f30760a630c6686d43a0d3d842afb489d /doc/source/command-objects
parent71796a0c4bcd9b9980c4937d8fe342ef609386cf (diff)
parent8c3138390af7c0a3b8272f7ebef67575f5083f34 (diff)
downloadpython-openstackclient-e49c3f6682a3c59cdee2dad58ab6fe6bb8c170cf.tar.gz
Merge "Sort commands in docs"
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/flavor.rst32
-rw-r--r--doc/source/command-objects/image.rst108
2 files changed, 70 insertions, 70 deletions
diff --git a/doc/source/command-objects/flavor.rst b/doc/source/command-objects/flavor.rst
index 2389f7dc..5893ff07 100644
--- 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
index 61872ec4..942c03d5 100644
--- 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)