summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-05-30 20:53:38 +0000
committerGerrit Code Review <review@openstack.org>2014-05-30 20:53:38 +0000
commit70f50944fec479d3fbbc1c5ecc2be75d307ff239 (patch)
treeeec373643b6e38a6de625359469b100841b25eac
parent9844f4dcdcd44bf9566ad182b3efd531d7c6f38d (diff)
parent64a19ad8c6dfb86ba7ca48b93360b172d7585365 (diff)
downloadpython-troveclient-70f50944fec479d3fbbc1c5ecc2be75d307ff239.tar.gz
Merge "Updates README with current trove help output"
-rw-r--r--README.rst24
-rw-r--r--troveclient/v1/shell.py2
2 files changed, 13 insertions, 13 deletions
diff --git a/README.rst b/README.rst
index da879c8..1646f58 100644
--- a/README.rst
+++ b/README.rst
@@ -73,7 +73,7 @@ You'll find complete documentation on the shell by running
Positional arguments:
<subcommand>
- backup-create Creates a backup.
+ backup-create Creates a backup of an instance.
backup-delete Deletes a backup.
backup-list Lists available backups.
backup-list-instance
@@ -104,7 +104,7 @@ You'll find complete documentation on the shell by running
Updates a configuration group.
create Creates a new instance.
database-create Creates a database on an instance.
- database-delete Deletes a database.
+ database-delete Deletes a database from an instance.
database-list Lists available databases on an instance.
datastore-list Lists available datastores.
datastore-show Shows details of a datastore.
@@ -119,24 +119,24 @@ You'll find complete documentation on the shell by running
list Lists all the instances.
resize-flavor Resizes the flavor of an instance.
resize-volume Resizes the volume size of an instance.
- restart Restarts the instance.
- root-enable Enables root for a instance.
- root-show Gets root enabled status for a instance.
+ restart Restarts an instance.
+ root-enable Enables root for an instance.
+ root-show Shows 'root enabled' status of an instance.
secgroup-add-rule Creates a security group rule.
secgroup-delete-rule
Deletes a security group rule.
secgroup-list Lists all security groups.
- secgroup-show Shows details about a security group.
+ secgroup-show Shows details of a security group.
show Shows details of an instance.
- user-create Creates a user.
- user-delete Deletes a user from the instance.
+ user-create Creates a user on an instance.
+ user-delete Deletes a user from an instance.
user-grant-access Grants access to a database(s) for a user.
- user-list Lists the users for a instance.
+ user-list Lists the users for an instance.
user-revoke-access Revokes access to a database for a user.
- user-show Gets a user from the instance.
- user-show-access Gets a users access from the instance.
+ user-show Shows details of a user of an instance.
+ user-show-access Shows access details of a user of an instance.
user-update-attributes
- Updates a users attributes from the instance.
+ Updates a user's attributes on an instance.
bash-completion Prints arguments for bash_completion.
help Displays help about this program or one of its
subcommands.
diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py
index 5d23006..1ce9203 100644
--- a/troveclient/v1/shell.py
+++ b/troveclient/v1/shell.py
@@ -556,7 +556,7 @@ def do_root_enable(cs, args):
@utils.arg('instance', metavar='<instance>', help='ID of the instance.')
@utils.service_type('database')
def do_root_show(cs, args):
- """Shows 'root enabled' status of a instance."""
+ """Shows 'root enabled' status of an instance."""
root = cs.root.is_root_enabled(args.instance)
utils.print_dict({'is_root_enabled': root.rootEnabled})