diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 18:41:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 18:41:06 +0000 |
| commit | 9a6672b8aa6d97ca245b2457ab39cd75ab1e8e89 (patch) | |
| tree | 3ce0ecb520e0accd684215bfc0ac5f4fd87dbaac /doc | |
| parent | 0fa9228dbcf421bb723184a477950ad9392b7a50 (diff) | |
| parent | 32e0ed6980abab17c2027063b97784d092b44cee (diff) | |
| download | python-openstackclient-9a6672b8aa6d97ca245b2457ab39cd75ab1e8e89.tar.gz | |
Merge "Change 'Object Store' to 'Object Storage'"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/command-objects/container.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/object-store-account.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/object.rst | 2 | ||||
| -rw-r--r-- | doc/source/commands.rst | 4 | ||||
| -rw-r--r-- | doc/source/index.rst | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/source/command-objects/container.rst b/doc/source/command-objects/container.rst index 251e3f31..e6517e9b 100644 --- a/doc/source/command-objects/container.rst +++ b/doc/source/command-objects/container.rst @@ -2,7 +2,7 @@ container ========= -Object Store v1 +Object Storage v1 container create ---------------- diff --git a/doc/source/command-objects/object-store-account.rst b/doc/source/command-objects/object-store-account.rst index bdc9393e..ba37078e 100644 --- a/doc/source/command-objects/object-store-account.rst +++ b/doc/source/command-objects/object-store-account.rst @@ -2,7 +2,7 @@ object store account ==================== -Object Store v1 +Object Storage v1 object store account set ------------------------ diff --git a/doc/source/command-objects/object.rst b/doc/source/command-objects/object.rst index ac814417..5aaad8a5 100644 --- a/doc/source/command-objects/object.rst +++ b/doc/source/command-objects/object.rst @@ -2,7 +2,7 @@ object ====== -Object Store v1 +Object Storage v1 object create ------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 971739de..90aa481e 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -77,7 +77,7 @@ referring to both Compute and Volume quotas. * ``console log``: (**Compute**) server console text dump * ``console url``: (**Compute**) server remote console URL * ``consumer``: (**Identity**) OAuth-based delegatee -* ``container``: (**Object Store**) a grouping of objects +* ``container``: (**Object Storage**) a grouping of objects * ``credentials``: (**Identity**) specific to identity providers * ``domain``: (**Identity**) a grouping of projects * ``ec2 credentials``: (**Identity**) AWS EC2-compatible credentials @@ -99,7 +99,7 @@ referring to both Compute and Volume quotas. * ``mapping``: (**Identity**) a definition to translate identity provider attributes to Identity concepts * ``module``: internal - installed Python modules in the OSC process * ``network``: (**Network**) - a virtual network for connecting servers and other resources -* ``object``: (**Object Store**) a single file in the Object Store +* ``object``: (**Object Storage**) a single file in the Object Storage * ``policy``: (**Identity**) determines authorization * ``project``: (**Identity**) owns a group of resources * ``quota``: (**Compute**, **Volume**) resource usage restrictions diff --git a/doc/source/index.rst b/doc/source/index.rst index 6b7d63f3..50b1fd24 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -3,7 +3,7 @@ OpenStackClient =============== OpenStackClient (aka OSC) is a command-line client for OpenStack that -brings the command set for Compute, Identity, Image, Object Store and Volume +brings the command set for Compute, Identity, Image, Object Storage and Volume APIs together in a single shell with a uniform command structure. User Documentation |