From 30587ea4485e1f12c8116e7f3b26a08e3054409b Mon Sep 17 00:00:00 2001
From: Sushil Kumar <sushil.kumar2@globallogic.com>
Date: Wed, 27 Nov 2013 18:09:17 +0000
Subject: [PATCH] Updates README with new trove help options

Reasons:
- trove help section is an old one.

Changes:
- Updates the trove help section.
- Updates Command-line API options with the latest options.
- Updates shell.py for typos.

Closes-Bug: #1255613

Change-Id: If992d1a68a331ba50de06326b16ee86734abe52b
---
 README.rst              | 15 ++++++++++++---
 troveclient/v1/shell.py |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index b7fbffe1..be085beb 100644
--- a/README.rst
+++ b/README.rst
@@ -62,11 +62,11 @@ You'll find complete documentation on the shell by running
                   [--os-tenant-name <auth-tenant-name>]
                   [--os-tenant-id <auth-tenant-id>] [--os-auth-url <auth-url>]
                   [--os-region-name <region-name>] [--service-type <service-type>]
-                  [--service-name <service-name>]
+                  [--service-name <service-name>] [--bypass-url <bypass-url>]
                   [--database-service-name <database-service-name>]
                   [--endpoint-type <endpoint-type>]
                   [--os-database-api-version <database-api-ver>]
-                  [--os-cacert <ca-certificate>] [--retries <retries>]
+                  [--os-cacert <ca-certificate>] [--retries <retries>] [--json]
                   <subcommand> ...
 
      Command-line interface to the OpenStack Trove API.
@@ -83,6 +83,12 @@ You'll find complete documentation on the shell by running
          database-create     Creates a database on an instance.
          database-delete     Deletes a database.
          database-list       Lists available databases on an instance.
+         datastore-list      List all the datastores.
+         datastore-show      Show details of a datastore.
+         datastore-version-list
+                             List all the datastore versions.
+         datastore-version-show
+                             Show details of a datastore version.
          delete              Deletes an instance.
          flavor-list         Lists available flavors.
          flavor-show         Show details of a flavor.
@@ -132,7 +138,7 @@ You'll find complete documentation on the shell by running
        --service-name <service-name>
                              Defaults to env[TROVE_SERVICE_NAME]
        --bypass-url <bypass-url>
-                        Defaults to env[TROVE_BYPASS_URL]
+                             Defaults to env[TROVE_BYPASS_URL]
        --database-service-name <database-service-name>
                              Defaults to env[TROVE_DATABASE_SERVICE_NAME]
        --endpoint-type <endpoint-type>
@@ -143,6 +149,9 @@ You'll find complete documentation on the shell by running
                              Specify a CA bundle file to use in verifying a TLS
                              (https) server certificate. Defaults to env[OS_CACERT]
        --retries <retries>   Number of retries.
+       --json, --os-json-output
+                             Output json instead of prettyprint. Defaults to
+                             OS_JSON_OUTPUT
 
 Python API
 ----------
diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py
index dd259b3e..87225948 100644
--- a/troveclient/v1/shell.py
+++ b/troveclient/v1/shell.py
@@ -533,7 +533,7 @@ def do_datastore_list(cs, args):
            help='ID of the datastore.')
 @utils.service_type('database')
 def do_datastore_show(cs, args):
-    """Show details of an datastore."""
+    """Show details of a datastore."""
     datastore = cs.datastores.get(args.datastore)
     _print_instance(datastore)
 
@@ -553,7 +553,7 @@ def do_datastore_version_list(cs, args):
            help='ID of the datastore version.')
 @utils.service_type('database')
 def do_datastore_version_show(cs, args):
-    """Show details of an datastore version."""
+    """Show details of a datastore version."""
     datastore_version = cs.datastore_versions.get(args.datastore,
                                                   args.datastore_version)
     _print_instance(datastore_version)