diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-02 08:50:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-02 08:50:15 +0000 |
| commit | ee912035cad408dca9bc8bad0939feb988e4bfd9 (patch) | |
| tree | 29e696cda8f451d9469fd80007e2cee3c6ac3ae3 /doc | |
| parent | 0720c7819902d5ae27884afa49c973902467a50a (diff) | |
| parent | f18f264ed7b12fb73c3760514dcb226e28189572 (diff) | |
| download | python-openstackclient-ee912035cad408dca9bc8bad0939feb988e4bfd9.tar.gz | |
Merge "Command docs: domain"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/command-objects/domain.rst | 8 | ||||
| -rw-r--r-- | doc/source/commands.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/source/command-objects/domain.rst b/doc/source/command-objects/domain.rst index 057296ac..66697ac3 100644 --- a/doc/source/command-objects/domain.rst +++ b/doc/source/command-objects/domain.rst @@ -36,7 +36,7 @@ Create new domain If the domain already exists, return the existing domain data and do not fail. -.. option:: <domain-name> +.. describe:: <domain-name> New domain name @@ -51,7 +51,7 @@ Delete domain os domain delete <domain> -.. option:: <domain> +.. describe:: <domain> Domain to delete (name or ID) @@ -95,7 +95,7 @@ Set domain properties Disable domain -.. option:: <domain> +.. describe:: <domain> Domain to modify (name or ID) @@ -110,6 +110,6 @@ Show domain details os domain show <domain> -.. option:: <domain> +.. describe:: <domain> Domain to display (name or ID) diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 98084ea1..d8509d3c 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -79,7 +79,7 @@ referring to both Compute and Volume quotas. * ``consumer``: Identity - OAuth-based delegatee * ``container``: Object Store - a grouping of objects * ``credentials``: (**Identity**) specific to identity providers -* ``domain``: Identity - a grouping of projects +* ``domain``: (**Identity**) a grouping of projects * ``endpoint``: (**Identity**) the base URL used to contact a specific service * ``extension``: (**Compute**, **Identity**, **Volume**) OpenStack server API extensions * ``flavor``: (**Compute**) pre-defined server configurations: ram, root disk, etc |