From d5caa6a26baf2fccbf276080fef60c81ed4beae3 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 23 Dec 2014 17:04:12 -0600
Subject: Command object docs: container, object

Change-Id: Ie3df543a28cbee0cc809310a05f431c97b2c7e70
---
 openstackclient/object/v1/container.py | 18 +++++++++---------
 openstackclient/object/v1/object.py    | 32 ++++++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'openstackclient/object')

diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index ead3df45..b75888e4 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -27,7 +27,7 @@ from openstackclient.common import utils
 
 
 class CreateContainer(lister.Lister):
-    """Create a container"""
+    """Create new container"""
 
     log = logging.getLogger(__name__ + '.CreateContainer')
 
@@ -35,9 +35,9 @@ class CreateContainer(lister.Lister):
         parser = super(CreateContainer, self).get_parser(prog_name)
         parser.add_argument(
             'containers',
-            metavar='<container>',
+            metavar='<container-name>',
             nargs="+",
-            help='Container name(s) to create',
+            help='New container name(s)',
         )
         return parser
 
@@ -60,7 +60,7 @@ class CreateContainer(lister.Lister):
 
 
 class DeleteContainer(command.Command):
-    """Delete a container"""
+    """Delete container"""
 
     log = logging.getLogger(__name__ + '.DeleteContainer')
 
@@ -70,7 +70,7 @@ class DeleteContainer(command.Command):
             'containers',
             metavar='<container>',
             nargs="+",
-            help='Container name(s) to delete',
+            help='Container(s) to delete',
         )
         return parser
 
@@ -157,7 +157,7 @@ class ListContainer(lister.Lister):
 
 
 class SaveContainer(command.Command):
-    """Save the contents of a container locally"""
+    """Save container contents locally"""
 
     log = logging.getLogger(__name__ + ".SaveContainer")
 
@@ -166,7 +166,7 @@ class SaveContainer(command.Command):
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container name to save',
+            help='Container to save',
         )
         return parser
 
@@ -179,7 +179,7 @@ class SaveContainer(command.Command):
 
 
 class ShowContainer(show.ShowOne):
-    """Show container information"""
+    """Show container details"""
 
     log = logging.getLogger(__name__ + '.ShowContainer')
 
@@ -188,7 +188,7 @@ class ShowContainer(show.ShowOne):
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container name to display',
+            help='Container to display',
         )
         return parser
 
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index cbe9da2f..781dd047 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -27,7 +27,7 @@ from openstackclient.common import utils
 
 
 class CreateObject(lister.Lister):
-    """Upload an object to a container"""
+    """Upload object to container"""
 
     log = logging.getLogger(__name__ + '.CreateObject')
 
@@ -36,13 +36,13 @@ class CreateObject(lister.Lister):
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container to store new object',
+            help='Container for new object',
         )
         parser.add_argument(
             'objects',
-            metavar='<object-name>',
+            metavar='<filename>',
             nargs="+",
-            help='Local path of object(s) to upload',
+            help='Local filename(s) to upload',
         )
         return parser
 
@@ -66,7 +66,7 @@ class CreateObject(lister.Lister):
 
 
 class DeleteObject(command.Command):
-    """Delete an object within a container"""
+    """Delete object from container"""
 
     log = logging.getLogger(__name__ + '.DeleteObject')
 
@@ -75,11 +75,11 @@ class DeleteObject(command.Command):
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container that stores the object to delete',
+            help='Delete object(s) from <container>',
         )
         parser.add_argument(
             'objects',
-            metavar='<object-name>',
+            metavar='<object>',
             nargs="+",
             help='Object(s) to delete',
         )
@@ -104,8 +104,8 @@ class ListObject(lister.Lister):
         parser = super(ListObject, self).get_parser(prog_name)
         parser.add_argument(
             "container",
-            metavar="<container-name>",
-            help="List contents of container-name",
+            metavar="<container>",
+            help="Container to list",
         )
         parser.add_argument(
             "--prefix",
@@ -188,7 +188,7 @@ class ListObject(lister.Lister):
 
 
 class SaveObject(command.Command):
-    """Save an object locally"""
+    """Save object locally"""
 
     log = logging.getLogger(__name__ + ".SaveObject")
 
@@ -197,17 +197,17 @@ class SaveObject(command.Command):
         parser.add_argument(
             "--file",
             metavar="<filename>",
-            help="Downloaded object filename [defaults to object name]",
+            help="Destination filename (defaults to object name)",
         )
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container name that has the object',
+            help='Download <object> from <container>',
         )
         parser.add_argument(
             "object",
             metavar="<object>",
-            help="Name of the object to save",
+            help="Object to save",
         )
         return parser
 
@@ -222,7 +222,7 @@ class SaveObject(command.Command):
 
 
 class ShowObject(show.ShowOne):
-    """Show object information"""
+    """Show object details"""
 
     log = logging.getLogger(__name__ + '.ShowObject')
 
@@ -231,12 +231,12 @@ class ShowObject(show.ShowOne):
         parser.add_argument(
             'container',
             metavar='<container>',
-            help='Container name for object to display',
+            help='Display <object> from <container>',
         )
         parser.add_argument(
             'object',
             metavar='<object>',
-            help='Object name to display',
+            help='Object to display',
         )
         return parser
 
-- 
cgit v1.2.1