diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-04 16:23:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-04 16:23:30 +0000 |
| commit | 5aeb83115721a7a03acdb0bcbb14cf9e48ca4c53 (patch) | |
| tree | ce79fc503c0881b89da5f6841d6cf1765fe192f2 /doc/source/command-objects | |
| parent | 74a0b2a1901f8ba31ce9faee7ab18a48c6e558f9 (diff) | |
| parent | 54b0ef3358b25b0c164ee5f4eba07ee474513d3a (diff) | |
| download | python-openstackclient-5aeb83115721a7a03acdb0bcbb14cf9e48ca4c53.tar.gz | |
Merge "Use Block Storage instead of Volume"
Diffstat (limited to 'doc/source/command-objects')
| -rw-r--r-- | doc/source/command-objects/backup.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/extension.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/limits.rst | 6 | ||||
| -rw-r--r-- | doc/source/command-objects/quota.rst | 8 | ||||
| -rw-r--r-- | doc/source/command-objects/snapshot.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/volume-qos.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/volume-type.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/volume.rst | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/doc/source/command-objects/backup.rst b/doc/source/command-objects/backup.rst index ec201aa3..9d7fb95d 100644 --- a/doc/source/command-objects/backup.rst +++ b/doc/source/command-objects/backup.rst @@ -2,7 +2,7 @@ backup ====== -Volume v1 +Block Storage v1 backup create ------------- diff --git a/doc/source/command-objects/extension.rst b/doc/source/command-objects/extension.rst index 8f39a625..dff30fa1 100644 --- a/doc/source/command-objects/extension.rst +++ b/doc/source/command-objects/extension.rst @@ -34,7 +34,7 @@ List API extensions .. option:: --volume - List extensions for the Volume API + List extensions for the Block Storage API .. option:: --long diff --git a/doc/source/command-objects/limits.rst b/doc/source/command-objects/limits.rst index 0d466af6..6a7509f2 100644 --- a/doc/source/command-objects/limits.rst +++ b/doc/source/command-objects/limits.rst @@ -2,14 +2,14 @@ limits ====== -The Compute and Volume APIs have resource usage limits. +The Compute and Block Storage APIs have resource usage limits. -Compute v2, Volume v1 +Compute v2, Block Storage v1 limits show ----------- -Show compute and volume limits +Show compute and block storage limits .. program:: limits show .. code:: bash diff --git a/doc/source/command-objects/quota.rst b/doc/source/command-objects/quota.rst index 5ea49f8c..98e6df33 100644 --- a/doc/source/command-objects/quota.rst +++ b/doc/source/command-objects/quota.rst @@ -4,7 +4,7 @@ quota Resource quotas appear in multiple APIs, OpenStackClient presents them as a single object with multiple properties. -Compute v2, Volume v1 +Compute v2, Block Storage v1 quota set --------- @@ -26,7 +26,7 @@ Set quotas for project [--properties <num-properties>] [--ram <ram-mb>] - # Volume settings + # Block Storage settings [--gigabytes <new-gigabytes>] [--snapshots <new-snapshots>] [--volumes <new-volumes>] @@ -51,7 +51,7 @@ Set quotas for class [--properties <num-properties>] [--ram <ram-mb>] - # Volume settings + # Block Storage settings [--gigabytes <new-gigabytes>] [--snapshots <new-snapshots>] [--volumes <new-volumes>] @@ -161,4 +161,4 @@ Show quotas for project .. _quota_show-class: .. describe:: <class> - Class to show
\ No newline at end of file + Class to show diff --git a/doc/source/command-objects/snapshot.rst b/doc/source/command-objects/snapshot.rst index e05673b8..b4838684 100644 --- a/doc/source/command-objects/snapshot.rst +++ b/doc/source/command-objects/snapshot.rst @@ -2,7 +2,7 @@ snapshot ======== -Volume v1 +Block Storage v1 snapshot create --------------- diff --git a/doc/source/command-objects/volume-qos.rst b/doc/source/command-objects/volume-qos.rst index d0fe36f9..2d9d14a4 100644 --- a/doc/source/command-objects/volume-qos.rst +++ b/doc/source/command-objects/volume-qos.rst @@ -2,7 +2,7 @@ volume qos ========== -volume v1, v2 +Block Storage v1, v2 volume qos associate -------------------- diff --git a/doc/source/command-objects/volume-type.rst b/doc/source/command-objects/volume-type.rst index 0edd742a..8a113847 100644 --- a/doc/source/command-objects/volume-type.rst +++ b/doc/source/command-objects/volume-type.rst @@ -2,7 +2,7 @@ volume type =========== -Volume v1, v2 +Block Storage v1, v2 volume type create ------------------ diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst index cb52c560..bf89dc44 100644 --- a/doc/source/command-objects/volume.rst +++ b/doc/source/command-objects/volume.rst @@ -2,7 +2,7 @@ volume ====== -Volume v1, v2 +Block Storage v1, v2 volume create ------------- |