Merge "Use Block Storage instead of Volume"

13 files changed, 23 insertions, 21 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
 -------------
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 0ec4f71b..621a0a90 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -70,7 +70,7 @@ the API resources will be merged, as in the ``quota`` object that has options
 referring to both Compute and Volume quotas.
 
 * ``access token``: (**Identity**) long-lived OAuth-based token
-* ``availability zone``: (**Compute**) a logical partition of hosts or volume services
+* ``availability zone``: (**Compute**) a logical partition of hosts or block storage services
 * ``aggregate``: (**Compute**) a grouping of servers
 * ``backup``: (**Volume**) a volume copy
 * ``catalog``: (**Identity**) service catalog
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 49929972..cb38d845 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -3,8 +3,9 @@ OpenStackClient
 ===============
 
 OpenStackClient (aka OSC) is a command-line client for OpenStack that
-brings the command set for Compute, Identity, Image, Object Storage and Volume
-APIs together in a single shell with a uniform command structure.
+brings the command set for Compute, Identity, Image, Object Storage and
+Block Storage APIs together in a single shell with a uniform command
+structure.
 
 User Documentation
 ------------------
diff --git a/doc/source/man/openstack.rst b/doc/source/man/openstack.rst
index 3e47635e..a33b1891 100644
--- a/doc/source/man/openstack.rst
+++ b/doc/source/man/openstack.rst
@@ -171,7 +171,7 @@ project support.  The object names may consist of multiple words to compose a
 unique name.  Occasionally when multiple APIs have a common name with common
 overlapping purposes there will be options to select which object to use, or
 the API resources will be merged, as in the ``quota`` object that has options
-referring to both Compute and Volume quotas.
+referring to both Compute and Block Storage quotas.
 
 Command Actions
 ---------------
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index 193545e1..4013ae31 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -11,8 +11,9 @@ Adoption
 ========
 
 OpenStackClient promises to provide first class support for the following
-OpenStack services: Compute, Identity, Image, Storage, Volume and Network.
-These services are considered essential to any OpenStack deployment.
+OpenStack services: Compute, Identity, Image, Object Storage, Block Storage
+and Network. These services are considered essential to any OpenStack
+deployment.
 
 Other OpenStack services, such as Orchestration or Telemetry may create an
 OpenStackClient plugin. The source code will not be hosted by
diff --git a/doc/source/releases.rst b/doc/source/releases.rst
index 853ef955..063066ac 100644
--- a/doc/source/releases.rst
+++ b/doc/source/releases.rst
@@ -137,12 +137,12 @@ As of release 2.0 the release notes can be found on the OpenStack `Release Notes
 
 * Add ``--log-file`` option support
 
-* Set default Volume API version to ``2``
+* Set default Block Storage API version to ``2``
 
 1.6.0 (10 Aug 2015)
 ===================
 
-* Added support for Volume v2 APIs
+* Added support for Block Storage v2 APIs
   Blueprint `volume-v2 <https://blueprints.launchpad.net/python-openstackclient/+spec/volume-v2>`_
 
   * Backup