diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-17 18:43:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-17 18:43:32 +0000 |
| commit | 5e095d66b8974e908bd2c1e17bbcd5e41dfee660 (patch) | |
| tree | 041730a7667373a03c10ed16daa3f7b2ec632026 /doc/source | |
| parent | d4893efabce193c0444d5d05c1ea922d862bfa67 (diff) | |
| parent | 2b0013c5c1afe6d2fee5f93cf6928f6f910048c1 (diff) | |
| download | python-openstackclient-5e095d66b8974e908bd2c1e17bbcd5e41dfee660.tar.gz | |
Merge "Refactor option handling for user|group|project domain scoping"
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/command-objects/ec2-credentials.rst | 9 | ||||
| -rw-r--r-- | doc/source/command-objects/trust.rst | 9 |
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) |