7 files changed, 21 insertions, 21 deletions
diff --git a/doc/source/command-objects/aggregate.rst b/doc/source/command-objects/aggregate.rst
index 6c4baa53..7616c496 100644
--- a/doc/source/command-objects/aggregate.rst
+++ b/doc/source/command-objects/aggregate.rst
@@ -38,7 +38,7 @@ Create a new aggregate
 
     os aggregate create
         [--zone <availability-zone>]
-        [--property <key=value>]
+        [--property <key=value> [...] ]
         <name>
 
 .. option:: --zone <availability-zone>
@@ -115,7 +115,7 @@ Set aggregate properties
     os aggregate set
         [--name <new-name>]
         [--zone <availability-zone>]
-        [--property <key=value>]
+        [--property <key=value> [...] ]
         <aggregate>
 
 .. option:: --name <name>
@@ -160,8 +160,7 @@ Unset aggregate properties
 .. code-block:: bash
 
     os aggregate unset
-        --property <key>
-        [--property <key>] ...
+        [--property <key> [...] ]
         <aggregate>
 
 .. option:: --property <key>
diff --git a/doc/source/command-objects/endpoint.rst b/doc/source/command-objects/endpoint.rst
index 9872a587..817ad491 100644
--- a/doc/source/command-objects/endpoint.rst
+++ b/doc/source/command-objects/endpoint.rst
@@ -40,7 +40,7 @@ Create new endpoint
 .. _endpoint_create-endpoint:
 .. describe:: <service>
 
-    New endpoint service (name or ID)
+    Service to be associated with new endpoint (name or ID)
 
 *Identity version 3 only*
 
@@ -68,7 +68,7 @@ Create new endpoint
 
 .. describe:: <service>
 
-    New endpoint service (name or ID)
+    Service to be associated with new endpoint(name or ID)
 
 .. describe:: <interface>
 
@@ -92,7 +92,7 @@ Delete endpoint
 .. _endpoint_delete-endpoint:
 .. describe:: <endpoint-id>
 
-    Endpoint ID to delete
+    Endpoint to delete (ID only)
 
 endpoint list
 -------------
@@ -110,7 +110,7 @@ List endpoints
 
 .. option:: --service <service>
 
-    Filter by service
+    Filter by service (name or ID)
 
     *Identity version 3 only*
 
@@ -177,7 +177,7 @@ Set endpoint properties
 .. _endpoint_set-endpoint:
 .. describe:: <endpoint-id>
 
-    Endpoint ID to modify
+    Endpoint to modify (ID only)
 
 endpoint show
 -------------
diff --git a/doc/source/command-objects/server-image.rst b/doc/source/command-objects/server-image.rst
index 8b489342..eb44e47e 100644
--- a/doc/source/command-objects/server-image.rst
+++ b/doc/source/command-objects/server-image.rst
@@ -10,7 +10,7 @@ Compute v2
 server image create
 -------------------
 
-Create a new disk image from a running server
+Create a new server disk image from an existing server
 
 .. program:: server image create
 .. code:: bash
@@ -22,12 +22,12 @@ Create a new disk image from a running server
 
 .. option:: --name <image-name>
 
-    Name of new image (default is server name)
+    Name of new disk image (default: server name)
 
 .. option:: --wait
 
-    Wait for image create to complete
+    Wait for operation to complete
 
 .. describe:: <server>
 
-    Server (name or ID)
+    Server to create image (name or ID)
diff --git a/doc/source/command-objects/service.rst b/doc/source/command-objects/service.rst
index 352f68a0..421a298b 100644
--- a/doc/source/command-objects/service.rst
+++ b/doc/source/command-objects/service.rst
@@ -117,7 +117,7 @@ Set service properties
 .. _service_set-service:
 .. describe:: <service>
 
-    Service to update (type, name or ID)
+    Service to modify (type, name or ID)
 
 service show
 ------------
diff --git a/doc/source/command-objects/subnet-pool.rst b/doc/source/command-objects/subnet-pool.rst
index 8abf25a6..516b9bf4 100644
--- a/doc/source/command-objects/subnet-pool.rst
+++ b/doc/source/command-objects/subnet-pool.rst
@@ -81,18 +81,18 @@ Create subnet pool
 subnet pool delete
 ------------------
 
-Delete subnet pool
+Delete subnet pool(s)
 
 .. program:: subnet pool delete
 .. code:: bash
 
     os subnet pool delete
-        <subnet-pool>
+        <subnet-pool> [<subnet-pool> ...]
 
 .. _subnet_pool_delete-subnet-pool:
 .. describe:: <subnet-pool>
 
-    Subnet pool to delete (name or ID)
+    Subnet pool(s) to delete (name or ID)
 
 subnet pool list
 ----------------
diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst
index ff6354e6..c52d73f9 100644
--- a/doc/source/command-objects/subnet.rst
+++ b/doc/source/command-objects/subnet.rst
@@ -119,18 +119,18 @@ Create new subnet
 subnet delete
 -------------
 
-Delete a subnet
+Delete subnet(s)
 
 .. program:: subnet delete
 .. code:: bash
 
     os subnet delete
-        <subnet>
+        <subnet> [<subnet> ...]
 
 .. _subnet_delete-subnet:
 .. describe:: <subnet>
 
-    Subnet to delete (name or ID)
+    Subnet(s) to delete (name or ID)
 
 subnet list
 -----------
diff --git a/doc/source/command-objects/user.rst b/doc/source/command-objects/user.rst
index fbc0b6de..a9fee728 100644
--- a/doc/source/command-objects/user.rst
+++ b/doc/source/command-objects/user.rst
@@ -95,7 +95,7 @@ Delete user(s)
 .. _user_delete-user:
 .. describe:: <user>
 
-    User to delete (name or ID)
+    User(s) to delete (name or ID)
 
 user list
 ---------
@@ -143,6 +143,7 @@ Set user properties
         [--name <name>]
         [--project <project> [--project-domain <project-domain>]]
         [--password <password>]
+        [--password-prompt]
         [--email <email-address>]
         [--description <description>]
         [--enable|--disable]