summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorSteve Martinelli <stevemar@ca.ibm.com>2015-06-09 17:25:12 -0400
committerSteve Martinelli <stevemar@ca.ibm.com>2015-06-17 12:38:40 -0400
commit2b0013c5c1afe6d2fee5f93cf6928f6f910048c1 (patch)
tree87413a7156db9480e41a5fc158d20152bd2f097e /doc/source/command-objects
parentc508162d53eca70596ab28333982185cf27d1c38 (diff)
downloadpython-openstackclient-2b0013c5c1afe6d2fee5f93cf6928f6f910048c1.tar.gz
Refactor option handling for user|group|project domain scoping
put the common options in identity.common, this way the help is consistent Change-Id: I5b09cfb56fa0f8d16feb95150f216fccbe9f2b22
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/ec2-credentials.rst9
-rw-r--r--doc/source/command-objects/trust.rst9
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/source/command-objects/ec2-credentials.rst b/doc/source/command-objects/ec2-credentials.rst
index f8e38564..6748422e 100644
--- a/doc/source/command-objects/ec2-credentials.rst
+++ b/doc/source/command-objects/ec2-credentials.rst
@@ -28,19 +28,18 @@ Create EC2 credentials
.. option:: --user-domain <user-domain>
- Select user from a specific domain (name or ID)
- This can be used in case collisions between user names exist.
+ Domain the user belongs to (name or ID). This can be
+ used in case collisions between user names exist.
.. versionadded:: 3
.. option:: --project-domain <project-domain>
- Select project from a specific domain (name or ID)
- This can be used in case collisions between project names exist.
+ Domain the project belongs to (name or ID). This can be
+ used in case collisions between user names exist.
.. versionadded:: 3
-
The :option:`--project` and :option:`--user` options are typically only
useful for admin users, but may be allowed for other users depending on
the policy of the cloud and the roles granted to the user.
diff --git a/doc/source/command-objects/trust.rst b/doc/source/command-objects/trust.rst
index c5e16b46..556edc54 100644
--- a/doc/source/command-objects/trust.rst
+++ b/doc/source/command-objects/trust.rst
@@ -39,15 +39,16 @@ Create new trust
Sets an expiration date for the trust (format of YYYY-mm-ddTHH:MM:SS)
-.. option:: --project-domain <domain>
+.. option:: --project-domain <project-domain>
- Domain that contains <project> (name or ID)
+ Domain the project belongs to (name or ID). This can be
+ used in case collisions between user names exist.
-.. option:: --trustor-domain <domain>
+.. option:: --trustor-domain <trustor-domain>
Domain that contains <trustor> (name or ID)
-.. option:: --trustee-domain <domain>
+.. option:: --trustee-domain <trustee-domain>
Domain that contains <trustee> (name or ID)