summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-03 23:04:27 +0000
committerGerrit Code Review <review@openstack.org>2015-06-03 23:04:27 +0000
commit0c5f12aec063c689d859027c2944e1cc3497a1ff (patch)
tree8fb8703ad089c89fbead659cfbf297f7ecb165b2 /doc/source/command-objects
parent7f658c0aca25dd705765bd28e0fa9ea504dc596b (diff)
parent3fa0bbc7ee26766e7ba5d02cf43a940065fdf613 (diff)
downloadpython-openstackclient-0c5f12aec063c689d859027c2944e1cc3497a1ff.tar.gz
Merge "Clean up ec2 credentials help text"
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/ec2-credentials.rst20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/source/command-objects/ec2-credentials.rst b/doc/source/command-objects/ec2-credentials.rst
index d675dc8c..f8e38564 100644
--- a/doc/source/command-objects/ec2-credentials.rst
+++ b/doc/source/command-objects/ec2-credentials.rst
@@ -20,22 +20,22 @@ Create EC2 credentials
.. option:: --project <project>
- Specify an alternate project (default: current authenticated project)
+ Create credentials in project (name or ID; default: current authenticated project)
.. option:: --user <user>
- Specify an alternate user (default: current authenticated user)
+ Create credentials for user (name or ID; default: current authenticated user)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
.. option:: --project-domain <project-domain>
- Domain the project belongs to (name or ID).
+ Select project from a specific domain (name or ID)
This can be used in case collisions between project names exist.
.. versionadded:: 3
@@ -60,11 +60,11 @@ Delete EC2 credentials
.. option:: --user <user>
- Specify a user
+ Delete credentials for user (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
@@ -92,11 +92,11 @@ List EC2 credentials
.. option:: --user <user>
- Filter list by <user>
+ Filter list by <user> (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3
@@ -120,11 +120,11 @@ Display EC2 credentials details
.. option:: --user <user>
- Specify a user
+ Show credentials for user (name or ID)
.. option:: --user-domain <user-domain>
- Domain the user belongs to (name or ID).
+ Select user from a specific domain (name or ID)
This can be used in case collisions between user names exist.
.. versionadded:: 3