3 files changed, 23 insertions, 23 deletions

diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py
index 8fff4e6f..bfc2b115 100644
--- a/openstackclient/compute/v2/aggregate.py
+++ b/openstackclient/compute/v2/aggregate.py
@@ -37,12 +37,12 @@ class AddAggregateHost(show.ShowOne):
         parser.add_argument(
             'aggregate',
             metavar='<aggregate>',
-            help='Name or ID of aggregate',
+            help='Aggregate (name or ID)',
         )
         parser.add_argument(
             'host',
             metavar='<host>',
-            help='Host to add to aggregate',
+            help='Host to add to <aggregate>',
         )
         return parser
 
@@ -119,7 +119,7 @@ class DeleteAggregate(command.Command):
         parser.add_argument(
             'aggregate',
             metavar='<aggregate>',
-            help='Name or ID of aggregate to delete',
+            help='Aggregate to delete (name or ID)',
         )
         return parser
 
@@ -197,12 +197,12 @@ class RemoveAggregateHost(show.ShowOne):
         parser.add_argument(
             'aggregate',
             metavar='<aggregate>',
-            help='Name or ID of aggregate',
+            help='Aggregate (name or ID)',
         )
         parser.add_argument(
             'host',
             metavar='<host>',
-            help='Host to remove from aggregate',
+            help='Host to remove from <aggregate>',
         )
         return parser
 
@@ -235,23 +235,23 @@ class SetAggregate(show.ShowOne):
         parser.add_argument(
             'aggregate',
             metavar='<aggregate>',
-            help='Name or ID of aggregate to display',
+            help='Aggregate to modify (name or ID)',
         )
         parser.add_argument(
             '--name',
-            metavar='<new-name>',
-            help='New aggregate name',
+            metavar='<name>',
+            help='Set aggregate name',
         )
         parser.add_argument(
             "--zone",
             metavar="<availability-zone>",
-            help="Availability zone name",
+            help="Set availability zone name",
         )
         parser.add_argument(
             "--property",
             metavar="<key=value>",
             action=parseractions.KeyValueAction,
-            help='Property to add/change for this aggregate '
+            help='Property to set on <aggregate> '
                  '(repeat option to set multiple properties)',
         )
         return parser
@@ -299,7 +299,7 @@ class ShowAggregate(show.ShowOne):
         parser.add_argument(
             'aggregate',
             metavar='<aggregate>',
-            help='Name or ID of aggregate to display',
+            help='Aggregate to show (name or ID)',
         )
         return parser
 
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index 8206f302..082a3a0c 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -35,7 +35,7 @@ class ShowConsoleLog(command.Command):
         parser.add_argument(
             'server',
             metavar='<server>',
-            help='Server (name or ID)',
+            help='Server to show console log (name or ID)',
         )
         parser.add_argument(
             '--lines',
@@ -76,7 +76,7 @@ class ShowConsoleURL(show.ShowOne):
         parser.add_argument(
             'server',
             metavar='<server>',
-            help='Server (name or ID)',
+            help='Server to show URL (name or ID)',
         )
         type_group = parser.add_mutually_exclusive_group()
         type_group.add_argument(
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 22c07ef7..6a158d86 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -29,7 +29,7 @@ from openstackclient.common import utils
 
 
 class CreateKeypair(show.ShowOne):
-    """Create new keypair"""
+    """Create new public key"""
 
     log = logging.getLogger(__name__ + '.CreateKeypair')
 
@@ -38,7 +38,7 @@ class CreateKeypair(show.ShowOne):
         parser.add_argument(
             'name',
             metavar='<name>',
-            help='New keypair name',
+            help='New public key name',
         )
         parser.add_argument(
             '--public-key',
@@ -80,7 +80,7 @@ class CreateKeypair(show.ShowOne):
 
 
 class DeleteKeypair(command.Command):
-    """Delete a keypair"""
+    """Delete a public key"""
 
     log = logging.getLogger(__name__ + '.DeleteKeypair')
 
@@ -88,8 +88,8 @@ class DeleteKeypair(command.Command):
         parser = super(DeleteKeypair, self).get_parser(prog_name)
         parser.add_argument(
             'name',
-            metavar='<name>',
-            help='Name of keypair to delete',
+            metavar='<key>',
+            help='Public key to delete',
         )
         return parser
 
@@ -101,7 +101,7 @@ class DeleteKeypair(command.Command):
 
 
 class ListKeypair(lister.Lister):
-    """List keypairs"""
+    """List public key fingerprints"""
 
     log = logging.getLogger(__name__ + ".ListKeypair")
 
@@ -121,7 +121,7 @@ class ListKeypair(lister.Lister):
 
 
 class ShowKeypair(show.ShowOne):
-    """Show keypair details"""
+    """Show public key details"""
 
     log = logging.getLogger(__name__ + '.ShowKeypair')
 
@@ -129,14 +129,14 @@ class ShowKeypair(show.ShowOne):
         parser = super(ShowKeypair, self).get_parser(prog_name)
         parser.add_argument(
             'name',
-            metavar='<name>',
-            help='Name of keypair to display',
+            metavar='<key>',
+            help='Public key to show',
         )
         parser.add_argument(
             '--public-key',
             action='store_true',
             default=False,
-            help='Include public key in output',
+            help='Show only bare public key',
         )
         return parser