Merge "Help/docs cleanups: marker, limit, ip-address metavars"

29 files changed, 121 insertions, 118 deletions

diff --git a/doc/source/command-objects/container.rst b/doc/source/command-objects/container.rst
index c4310472..e68955ad 100644
--- a/doc/source/command-objects/container.rst
+++ b/doc/source/command-objects/container.rst
@@ -51,7 +51,7 @@ List containers
         [--prefix <prefix>]
         [--marker <marker>]
         [--end-marker <end-marker>]
-        [--limit <limit>]
+        [--limit <num-containers>]
         [--long]
         [--all]
 
@@ -67,7 +67,7 @@ List containers
 
     End anchor for paging
 
-.. option:: --limit <limit>
+.. option:: --limit <num-containers>
 
     Limit the number of containers returned
 
diff --git a/doc/source/command-objects/flavor.rst b/doc/source/command-objects/flavor.rst
index a9f8262e..6feb4498 100644
--- a/doc/source/command-objects/flavor.rst
+++ b/doc/source/command-objects/flavor.rst
@@ -108,8 +108,8 @@ List flavors
     openstack flavor list
         [--public | --private | --all]
         [--long]
-        [--marker <marker>]
-        [--limit <limit>]
+        [--marker <flavor-id>]
+        [--limit <num-flavors>]
 
 .. option:: --public
 
@@ -127,11 +127,11 @@ List flavors
 
     List additional fields in output
 
-.. option:: --marker <marker>
+.. option:: --marker <flavor-id>
 
     The last flavor ID of the previous page
 
-.. option:: --limit <limit>
+.. option:: --limit <num-flavors>
 
     Maximum number of flavors to display
 
diff --git a/doc/source/command-objects/floating-ip.rst b/doc/source/command-objects/floating-ip.rst
index 5a38bc1b..cbb473b8 100644
--- a/doc/source/command-objects/floating-ip.rst
+++ b/doc/source/command-objects/floating-ip.rst
@@ -15,8 +15,8 @@ Create floating IP
     openstack floating ip create
         [--subnet <subnet>]
         [--port <port>]
-        [--floating-ip-address <floating-ip-address>]
-        [--fixed-ip-address <fixed-ip-address>]
+        [--floating-ip-address <ip-address>]
+        [--fixed-ip-address <ip-address>]
         [--description <description>]
         [--project <project> [--project-domain <project-domain>]]
         <network>
@@ -31,12 +31,12 @@ Create floating IP
     Port to be associated with the floating IP (name or ID)
     *Network version 2 only*
 
-.. option:: --floating-ip-address <floating-ip-address>
+.. option:: --floating-ip-address <ip-address>
 
     Floating IP address
     *Network version 2 only*
 
-.. option:: --fixed-ip-address <fixed-ip-address>
+.. option:: --fixed-ip-address <ip-address>
 
     Fixed IP address mapped to the floating IP
     *Network version 2 only*
@@ -88,7 +88,7 @@ List floating IP(s)
     openstack floating ip list
         [--network <network>]
         [--port <port>]
-        [--fixed-ip-address <fixed-ip-address>]
+        [--fixed-ip-address <ip-address>]
         [--long]
         [--status <status>]
         [--project <project> [--project-domain <project-domain>]]
@@ -106,7 +106,7 @@ List floating IP(s)
 
     *Network version 2 only*
 
-.. option:: --fixed-ip-address <fixed-ip-address>
+.. option:: --fixed-ip-address <ip-address>
 
     List floating IP(s) according to given fixed IP address
 
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index c39d9a28..ec51fa93 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -199,8 +199,8 @@ List available images
         [--property <key=value>]
         [--long]
         [--sort <key>[:<direction>]]
-        [--limit <limit>]
-        [--marker <marker>]
+        [--limit <num-images>]
+        [--marker <image>]
 
 .. option:: --public
 
@@ -229,14 +229,18 @@ List available images
     Sort output by selected keys and directions(asc or desc) (default: name:asc),
     multiple keys and directions can be specified separated by comma
 
-.. option:: --limit <limit>
+.. option:: --limit <num-images>
 
     Maximum number of images to display.
 
-.. option:: --marker <marker>
+    *Image version 2 only*
 
-    The last image (name or ID) of the previous page. Display list of images
-    after marker. Display all images if not specified.
+.. option:: --marker <image>
+
+    The last image of the previous page. Display list of images
+    after marker. Display all images if not specified. (name or ID)
+
+    *Image version 2 only*
 
 image remove project
 --------------------
diff --git a/doc/source/command-objects/object.rst b/doc/source/command-objects/object.rst
index 0a32a827..6323c4ed 100644
--- a/doc/source/command-objects/object.rst
+++ b/doc/source/command-objects/object.rst
@@ -62,7 +62,7 @@ List objects
         [--delimiter <delimiter>]
         [--marker <marker>]
         [--end-marker <end-marker>]
-        [--limit <limit>]
+        [--limit <num-objects>]
         [--long]
         [--all]
         <container>
@@ -83,7 +83,7 @@ List objects
 
     End anchor for paging
 
-.. option:: --limit <limit>
+.. option:: --limit <num-objects>
 
     Limit number of objects returned
 
diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst
index 98642b9a..ddfbb445 100644
--- a/doc/source/command-objects/port.rst
+++ b/doc/source/command-objects/port.rst
@@ -44,7 +44,7 @@ Create new port
 
 .. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
 
-    Desired IP and/or subnet (name or ID) for this port:
+    Desired IP and/or subnet for this port (name or ID):
     subnet=<subnet>,ip-address=<ip-address>
     (repeat option to set multiple fixed IP addresses)
 
@@ -182,7 +182,7 @@ List ports
 
 .. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
 
-    Desired IP and/or subnet (name or ID) for filtering ports:
+    Desired IP and/or subnet for filtering ports (name or ID):
     subnet=<subnet>,ip-address=<ip-address>
     (repeat option to set multiple fixed IP addresses)
 
@@ -234,7 +234,7 @@ Set port properties
 
 .. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
 
-    Desired IP and/or subnet (name or ID) for this port:
+    Desired IP and/or subnet for this port (name or ID):
     subnet=<subnet>,ip-address=<ip-address>
     (repeat option to set multiple fixed IP addresses)
 
@@ -363,8 +363,8 @@ Unset port properties
 
 .. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
 
-    Desired IP and/or subnet (name or ID) which should be removed
-    from this port: subnet=<subnet>,ip-address=<ip-address>
+    Desired IP and/or subnet which should be removed
+    from this port (name or ID): subnet=<subnet>,ip-address=<ip-address>
     (repeat option to unset multiple fixed IP addresses)
 
 .. option:: --binding-profile <binding-profile-key>
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 5efc057f..4ac05c70 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -18,11 +18,11 @@ Add fixed IP address to server
 
 .. describe:: <server>
 
-    Server (name or ID) to receive the fixed IP address
+    Server to receive the fixed IP address (name or ID)
 
 .. describe:: <network>
 
-    Network (name or ID) to allocate the fixed IP address from
+    Network to allocate the fixed IP address from (name or ID)
 
 server add floating ip
 ----------------------
@@ -33,21 +33,21 @@ Add floating IP address to server
 .. code:: bash
 
     openstack server add floating ip
-        [--fixed-ip-address <fixed-ip-address>]
+        [--fixed-ip-address <ip-address>]
         <server>
         <ip-address>
 
-.. option:: --fixed-ip-address <fixed-ip-address>
+.. option:: --fixed-ip-address <ip-address>
 
     Fixed IP address to associate with this floating IP address
 
 .. describe:: <server>
 
-    Server (name or ID) to receive the floating IP address
+    Server to receive the floating IP address (name or ID)
 
 .. describe:: <ip-address>
 
-    Floating IP address (IP address only) to assign to server
+    Floating IP address to assign to server (IP only)
 
 server add port
 ---------------
@@ -284,7 +284,7 @@ List servers
         [--project <project> [--project-domain <project-domain>]]
         [--long]
         [--marker <server>]
-        [--limit <limit>]
+        [--limit <num-servers>]
         [--deleted]
         [--changes-since <changes-since>]
 
@@ -352,10 +352,10 @@ List servers
 
 .. option:: --marker <server>
 
-    The last server (name or ID) of the previous page. Display list of servers
-    after marker. Display all servers if not specified.
+    The last server of the previous page. Display list of servers
+    after marker. Display all servers if not specified. (name or ID)
 
-.. option:: --limit <limit>
+.. option:: --limit <num-servers>
 
     Maximum number of servers to display. If limit equals -1, all servers will
     be displayed. If limit is greater than 'osapi_max_limit' option of Nova
@@ -517,11 +517,11 @@ Remove fixed IP address from server
 
 .. describe:: <server>
 
-    Server (name or ID) to remove the fixed IP address from
+    Server to remove the fixed IP address from (name or ID)
 
 .. describe:: <ip-address>
 
-    Fixed IP address (IP address only) to remove from the server
+    Fixed IP address to remove from the server (IP only)
 
 server remove floating ip
 -------------------------
@@ -537,11 +537,11 @@ Remove floating IP address from server
 
 .. describe:: <server>
 
-    Server (name or ID) to remove the floating IP address from
+    Server to remove the floating IP address from (name or ID)
 
 .. describe:: <ip-address>
 
-    Floating IP address (IP address only) to remove from server
+    Floating IP address to remove from server (IP only)
 
 server remove port
 ------------------
diff --git a/doc/source/command-objects/snapshot.rst b/doc/source/command-objects/snapshot.rst
index c5c431d0..fc516067 100644
--- a/doc/source/command-objects/snapshot.rst
+++ b/doc/source/command-objects/snapshot.rst
@@ -72,8 +72,8 @@ List snapshots
     openstack snapshot list
         [--all-projects]
         [--long]
-        [--limit <limit>]
-        [--marker <marker>]
+        [--limit <num-snapshots>]
+        [--marker <snapshot>]
 
 .. option:: --all-projects
 
@@ -83,13 +83,13 @@ List snapshots
 
     List additional fields in output
 
-.. option:: --limit <limit>
+.. option:: --limit <num-snapshots>
 
     Maximum number of snapshots to display
 
     *Volume version 2 only*
 
-.. option:: --marker <marker>
+.. option:: --marker <snapshot>
 
     The last snapshot ID of the previous page
 
diff --git a/doc/source/command-objects/subnet-pool.rst b/doc/source/command-objects/subnet-pool.rst
index 8b59bf8a..d47673de 100644
--- a/doc/source/command-objects/subnet-pool.rst
+++ b/doc/source/command-objects/subnet-pool.rst
@@ -150,7 +150,7 @@ List subnet pools
 
 .. option:: --address-scope <address-scope>
 
-    List only subnet pools of given address scope (name or ID) in output
+    List only subnet pools of given address scope in output (name or ID)
 
 subnet pool set
 ---------------
diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst
index 5eb55c23..4e609361 100644
--- a/doc/source/command-objects/subnet.rst
+++ b/doc/source/command-objects/subnet.rst
@@ -194,7 +194,7 @@ List subnets
 
 .. option:: --project <project>
 
-    List only subnets which belong to a given project (name or ID) in output
+    List only subnets which belong to a given project in output (name or ID)
 
 .. option:: --project-domain <project-domain>
 
@@ -203,7 +203,7 @@ List subnets
 
 .. option:: --network <network>
 
-    List only subnets which belong to a given network (name or ID) in output
+    List only subnets which belong to a given network in output (name or ID)
 
 .. option:: --gateway <gateway>
 
diff --git a/doc/source/command-objects/volume-backup.rst b/doc/source/command-objects/volume-backup.rst
index f2f814c5..585f47d4 100644
--- a/doc/source/command-objects/volume-backup.rst
+++ b/doc/source/command-objects/volume-backup.rst
@@ -92,8 +92,8 @@ List volume backups
         [--name <name>]
         [--status <status>]
         [--volume <volume>]
-        [--marker <marker>]
-        [--limit <limit>]
+        [--marker <volume-backup>]
+        [--limit <num-backups>]
         [--all-projects]
 
 .. _volume_backup_list-backup:
@@ -114,13 +114,13 @@ List volume backups
 
     Filters results by the volume which they backup (name or ID)"
 
-.. option:: --marker <marker>
+.. option:: --marker <volume-backup>
 
     The last backup of the previous page (name or ID)
 
     *Volume version 2 only*
 
-.. option:: --limit <limit>
+.. option:: --limit <num-backups>
 
     Maximum number of backups to display
 
diff --git a/doc/source/command-objects/volume-snapshot.rst b/doc/source/command-objects/volume-snapshot.rst
index 449e45b9..67db62f2 100644
--- a/doc/source/command-objects/volume-snapshot.rst
+++ b/doc/source/command-objects/volume-snapshot.rst
@@ -84,8 +84,8 @@ List volume snapshots
         [--all-projects]
         [--project <project> [--project-domain <project-domain>]]
         [--long]
-        [--limit <limit>]
-        [--marker <marker>]
+        [--limit <num-snapshots>]
+        [--marker <snapshot>]
         [--name <name>]
         [--status <status>]
         [--volume <volume>]
@@ -125,13 +125,13 @@ List volume snapshots
 
     Filters results by a volume (name or ID).
 
-.. option:: --limit <limit>
+.. option:: --limit <num-snapshots>
 
     Maximum number of snapshots to display
 
     *Volume version 2 only*
 
-.. option:: --marker <marker>
+.. option:: --marker <snapshot>
 
     The last snapshot ID of the previous page
 
diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst
index 85a920eb..a06a5d40 100644
--- a/doc/source/command-objects/volume.rst
+++ b/doc/source/command-objects/volume.rst
@@ -158,8 +158,8 @@ List volumes
         [--status <status>]
         [--all-projects]
         [--long]
-        [--limit <limit>]
-        [--marker <marker>]
+        [--limit <num-volumes>]
+        [--marker <volume>]
 
 .. option:: --project <project>
 
@@ -205,11 +205,11 @@ List volumes
 
     List additional fields in output
 
-.. option:: --limit <limit>
+.. option:: --limit <num-volumes>
 
     Maximum number of volumes to display
 
-.. option:: --marker <marker>
+.. option:: --marker <volume>
 
     The last volume ID of the previous page
 
diff --git a/doc/source/command-options.rst b/doc/source/command-options.rst
index 8d1d1c4e..886c17d2 100644
--- a/doc/source/command-options.rst
+++ b/doc/source/command-options.rst
@@ -283,11 +283,11 @@ There are many ways to do pagination, some OpenStack APIs support it, some
 don't. OpenStackClient attempts to define a single common way to specify
 pagination on the command line.
 
-.. option:: --marker <marker>
+.. option:: --marker <resource>
 
-    Anchor for paging
+    Anchor for paging (name or ID)
 
-.. option:: --limit <limit>
+.. option:: --limit <num-resources>
 
     Limit number of <resource> returned (*integer*)
 
@@ -300,13 +300,13 @@ The parser declaration should look like this:
 
         parser.add_argument(
             "--marker",
-            metavar="<marker>",
-            help="Anchor for paging",
+            metavar="<resource>",
+            help="Anchor for paging (name or ID)",
         )
 
         parser.add_argument(
             "--limit",
-            metavar="<limit>",
+            metavar="<num-resources>",
             type=int,
             help="Limit the number of <resource> returned",
         )
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 009c9bd1..bf9921b7 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -251,13 +251,13 @@ class ListFlavor(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar="<marker>",
+            metavar="<flavor-id>",
             help=_("The last flavor ID of the previous page")
         )
         parser.add_argument(
             '--limit',
             type=int,
-            metavar="<limit>",
+            metavar="<num-flavors>",
             help=_("Maximum number of flavors to display")
         )
         return parser
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 13c4c2d8..edb06603 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -197,13 +197,14 @@ class AddFixedIP(command.Command):
         parser.add_argument(
             "server",
             metavar="<server>",
-            help=_("Server (name or ID) to receive the fixed IP address"),
+            help=_("Server to receive the fixed IP address (name or ID)"),
         )
         parser.add_argument(
             "network",
             metavar="<network>",
-            help=_("Network (name or ID) to allocate "
-                   "the fixed IP address from"),
+            help=_(
+                "Network to allocate the fixed IP address from (name or ID)"
+            ),
         )
         return parser
 
@@ -227,17 +228,16 @@ class AddFloatingIP(command.Command):
         parser.add_argument(
             "server",
             metavar="<server>",
-            help=_("Server (name or ID) to receive the floating IP address"),
+            help=_("Server to receive the floating IP address (name or ID)"),
         )
         parser.add_argument(
             "ip_address",
             metavar="<ip-address>",
-            help=_("Floating IP address (IP address only) to assign "
-                   "to server"),
+            help=_("Floating IP address to assign to server (IP only)"),
         )
         parser.add_argument(
             "--fixed-ip-address",
-            metavar="<fixed-ip-address>",
+            metavar="<ip-address>",
             help=_("Fixed IP address to associate with this floating IP "
                    "address"),
         )
@@ -853,21 +853,21 @@ class ListServer(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<server>',
             default=None,
-            help=_('The last server (name or ID) of the previous page. Display'
-                   ' list of servers after marker. Display all servers if not'
-                   ' specified.')
+            help=_('The last server of the previous page. Display '
+                   'list of servers after marker. Display all servers if not '
+                   'specified. (name or ID)')
         )
         parser.add_argument(
             '--limit',
-            metavar='<limit>',
+            metavar='<num-servers>',
             type=int,
             default=None,
-            help=_("Maximum number of servers to display. If limit equals -1,"
-                   " all servers will be displayed. If limit is greater than"
-                   " 'osapi_max_limit' option of Nova API,"
-                   " 'osapi_max_limit' will be used instead."),
+            help=_("Maximum number of servers to display. If limit equals -1, "
+                   "all servers will be displayed. If limit is greater than "
+                   "'osapi_max_limit' option of Nova API, "
+                   "'osapi_max_limit' will be used instead."),
         )
         parser.add_argument(
             '--deleted',
@@ -1328,13 +1328,12 @@ class RemoveFixedIP(command.Command):
         parser.add_argument(
             "server",
             metavar="<server>",
-            help=_("Server (name or ID) to remove the fixed IP address from"),
+            help=_("Server to remove the fixed IP address from (name or ID)"),
         )
         parser.add_argument(
             "ip_address",
             metavar="<ip-address>",
-            help=_("Fixed IP address (IP address only) to remove from the "
-                   "server"),
+            help=_("Fixed IP address to remove from the server (IP only)"),
         )
         return parser
 
@@ -1355,14 +1354,14 @@ class RemoveFloatingIP(command.Command):
         parser.add_argument(
             "server",
             metavar="<server>",
-            help=_("Server (name or ID) to remove the "
-                   "floating IP address from"),
+            help=_(
+                "Server to remove the floating IP address from (name or ID)"
+            ),
         )
         parser.add_argument(
             "ip_address",
             metavar="<ip-address>",
-            help=_("Floating IP address (IP address only) "
-                   "to remove from server"),
+            help=_("Floating IP address to remove from server (IP only)"),
         )
         return parser
 
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index c4be69f0..766de4de 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -463,17 +463,17 @@ class ListImage(command.Lister):
         )
         parser.add_argument(
             "--limit",
-            metavar="<limit>",
+            metavar="<num-images>",
             type=int,
             help=_("Maximum number of images to display."),
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<image>',
             default=None,
-            help=_("The last image (name or ID) of the previous page. Display "
+            help=_("The last image of the previous page. Display "
                    "list of images after marker. Display all images if not "
-                   "specified."),
+                   "specified. (name or ID)"),
         )
         return parser
 
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index 41b208aa..ee39a299 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -162,13 +162,13 @@ class CreateFloatingIP(common.NetworkAndComputeShowOne):
         )
         parser.add_argument(
             '--floating-ip-address',
-            metavar='<floating-ip-address>',
+            metavar='<ip-address>',
             dest='floating_ip_address',
             help=_("Floating IP address")
         )
         parser.add_argument(
             '--fixed-ip-address',
-            metavar='<fixed-ip-address>',
+            metavar='<ip-address>',
             dest='fixed_ip_address',
             help=_("Fixed IP address mapped to the floating IP")
         )
@@ -307,7 +307,7 @@ class ListFloatingIP(common.NetworkAndComputeLister):
         )
         parser.add_argument(
             '--fixed-ip-address',
-            metavar='<fixed-ip-address>',
+            metavar='<ip-address>',
             help=_("List floating IP(s) according to "
                    "given fixed IP address")
         )
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index f77f566d..9d598fab 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -301,7 +301,7 @@ class CreatePort(command.ShowOne):
             metavar='subnet=<subnet>,ip-address=<ip-address>',
             action=parseractions.MultiKeyValueAction,
             optional_keys=['subnet', 'ip-address'],
-            help=_("Desired IP and/or subnet (name or ID) for this port: "
+            help=_("Desired IP and/or subnet for this port (name or ID): "
                    "subnet=<subnet>,ip-address=<ip-address> "
                    "(repeat option to set multiple fixed IP addresses)")
         )
@@ -496,9 +496,9 @@ class ListPort(command.Lister):
             metavar='subnet=<subnet>,ip-address=<ip-address>',
             action=parseractions.MultiKeyValueAction,
             optional_keys=['subnet', 'ip-address'],
-            help=_("Desired IP and/or subnet (name or ID) for filtering "
-                   "ports: subnet=<subnet>,ip-address=<ip-address> "
-                   "(repeat option to set multiple fixed IP addresses)")
+            help=_("Desired IP and/or subnet for filtering ports "
+                   "(name or ID): subnet=<subnet>,ip-address=<ip-address> "
+                   "(repeat option to set multiple fixed IP addresses)"),
         )
         return parser
 
@@ -593,7 +593,7 @@ class SetPort(command.Command):
             metavar='subnet=<subnet>,ip-address=<ip-address>',
             action=parseractions.MultiKeyValueAction,
             optional_keys=['subnet', 'ip-address'],
-            help=_("Desired IP and/or subnet (name or ID) for this port: "
+            help=_("Desired IP and/or subnet for this port (name or ID): "
                    "subnet=<subnet>,ip-address=<ip-address> "
                    "(repeat option to set multiple fixed IP addresses)")
         )
@@ -757,8 +757,8 @@ class UnsetPort(command.Command):
             metavar='subnet=<subnet>,ip-address=<ip-address>',
             action=parseractions.MultiKeyValueAction,
             optional_keys=['subnet', 'ip-address'],
-            help=_("Desired IP and/or subnet (name or ID) which should be "
-                   "removed from this port: subnet=<subnet>,"
+            help=_("Desired IP and/or subnet which should be "
+                   "removed from this port (name or ID): subnet=<subnet>,"
                    "ip-address=<ip-address> (repeat option to unset multiple "
                    "fixed IP addresses)"))
 
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 403b4cd2..2fdd11f0 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -428,14 +428,14 @@ class ListSubnet(command.Lister):
             '--project',
             metavar='<project>',
             help=_("List only subnets which belong to a given project "
-                   "(name or ID) in output")
+                   "in output (name or ID)")
         )
         identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--network',
             metavar='<network>',
             help=_("List only subnets which belong to a given network "
-                   "(name or ID) in output")
+                   "in output (name or ID)")
         )
         parser.add_argument(
             '--gateway',
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 04731111..82ad9412 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -282,7 +282,7 @@ class ListSubnetPool(command.Lister):
             '--address-scope',
             metavar='<address-scope>',
             help=_("List only subnet pools of given address scope "
-                   "(name or ID) in output")
+                   "in output (name or ID)")
         )
         return parser
 
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index 88fb8602..9f689ab6 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -119,7 +119,7 @@ class ListContainer(command.Lister):
         )
         parser.add_argument(
             "--limit",
-            metavar="<limit>",
+            metavar="<num-containers>",
             type=int,
             help=_("Limit the number of containers returned"),
         )
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 71b6f520..e79cea48 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -139,7 +139,7 @@ class ListObject(command.Lister):
         )
         parser.add_argument(
             "--limit",
-            metavar="<limit>",
+            metavar="<num-objects>",
             type=int,
             help=_("Limit the number of objects returned"),
         )
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 8e1097f5..0121e059 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -291,7 +291,7 @@ class ListVolume(command.Lister):
             '--limit',
             type=int,
             action=parseractions.NonNegativeAction,
-            metavar='<limit>',
+            metavar='<num-volumes>',
             help=_('Maximum number of volumes to display'),
         )
         return parser
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index 00389fcb..60633a70 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -202,14 +202,14 @@ class ListVolumeBackup(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<volume-backup>',
             help=_('The last backup of the previous page (name or ID)'),
         )
         parser.add_argument(
             '--limit',
             type=int,
             action=parseractions.NonNegativeAction,
-            metavar='<limit>',
+            metavar='<num-backups>',
             help=_('Maximum number of backups to display'),
         )
         parser.add_argument(
diff --git a/openstackclient/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py
index a18887e3..82b31033 100644
--- a/openstackclient/volume/v2/snapshot.py
+++ b/openstackclient/volume/v2/snapshot.py
@@ -146,14 +146,14 @@ class ListSnapshot(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<snapshot>',
             help=_('The last snapshot ID of the previous page'),
         )
         parser.add_argument(
             '--limit',
             type=int,
             action=parseractions.NonNegativeAction,
-            metavar='<limit>',
+            metavar='<num-snapshots>',
             help=_('Maximum number of snapshots to display'),
         )
         return parser
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index c361d700..2b6c966d 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -341,14 +341,14 @@ class ListVolume(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<volume>',
             help=_('The last volume ID of the previous page'),
         )
         parser.add_argument(
             '--limit',
             type=int,
             action=parseractions.NonNegativeAction,
-            metavar='<limit>',
+            metavar='<num-volumes>',
             help=_('Maximum number of volumes to display'),
         )
         return parser
diff --git a/openstackclient/volume/v2/volume_snapshot.py b/openstackclient/volume/v2/volume_snapshot.py
index f12cfed9..804c8291 100644
--- a/openstackclient/volume/v2/volume_snapshot.py
+++ b/openstackclient/volume/v2/volume_snapshot.py
@@ -180,14 +180,14 @@ class ListVolumeSnapshot(command.Lister):
         )
         parser.add_argument(
             '--marker',
-            metavar='<marker>',
+            metavar='<volume-snapshot>',
             help=_('The last snapshot ID of the previous page'),
         )
         parser.add_argument(
             '--limit',
             type=int,
             action=parseractions.NonNegativeAction,
-            metavar='<limit>',
+            metavar='<num-snapshots>',
             help=_('Maximum number of snapshots to display'),
         )
         parser.add_argument(
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index 8d2901f2..64c4d652 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -544,7 +544,7 @@ class UnsetVolumeType(command.Command):
             '--project',
             metavar='<project>',
             help=_('Removes volume type access to project (name or ID) '
-                   ' (admin only)'),
+                   '(admin only)'),
         )
         identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(