Merge "Set object store arg order in docs"

Author: Jenkins

doc/source/command-objects/container.rst

@@ -98,17 +98,17 @@ Set container properties
 .. code:: bash
 
     os container set
-        [<container>]
         [--property <key=value> [...] ]
-
-.. describe:: <container>
-
-    Container to modify
+        [<container>]
 
 .. option:: --property <key=value>
 
     Set a property on this container (repeat option to set multiple properties)
 
+.. describe:: <container>
+
+    Container to modify
+
 container show
 --------------
 
@@ -133,13 +133,13 @@ Unset container properties
 .. code:: bash
 
     os container unset
-        [<container>]
         [--property <key>]
-
-.. describe:: <container>
-
-    Container to modify
+        [<container>]
 
 .. option:: --property <key>
 
     Property to remove from container (repeat option to remove multiple properties)
+
+.. describe:: <container>
+
+    Container to modify

doc/source/command-objects/object.rst

@@ -128,9 +128,13 @@ Set object properties
 .. code:: bash
 
     os object set
+        [--property <key=value> [...] ]
         <container>
         [<object>]
-        [--property <key=value> [...] ]
+
+.. option:: --property <key=value>
+
+    Set a property on this object (repeat option to set multiple properties)
 
 .. describe:: <container>
 
@@ -140,10 +144,6 @@ Set object properties
 
     Object to modify
 
-.. option:: --property <key=value>
-
-    Set a property on this object (repeat option to set multiple properties)
-
 object show
 -----------
 
@@ -173,9 +173,13 @@ Unset object properties
 .. code:: bash
 
     os object unset
+        [--property <key>]
         <container>
         [<object>]
-        [--property <key>]
+
+.. option:: --property <key>
+
+    Property to remove from object (repeat option to remove multiple properties)
 
 .. describe:: <container>
 
@@ -184,7 +188,3 @@ Unset object properties
 .. describe:: <object>
 
     Object to modify
-
-.. option:: --property <key>
-
-    Property to remove from object (repeat option to remove multiple properties)