Merge "Change cinder to OpenStack Block Storage"

api-ref/src/docbkx/ch_blockstorage-api-v2.xml

@@ -10,7 +10,7 @@
     <title>Block Storage API v2 (CURRENT)</title>
     <para>
         Manages volumes and snapshots for use with the Block Storage API,
-        which is also known as cinder services.
+        also known as cinder services.
     </para>
     <section xml:id="volume-api-v2-versions">
         <title>API versions</title>
@@ -37,8 +37,8 @@
             A volume is a detachable block storage device. Think of it as a
             USB hard drive. You can attach a volume to one instance at a time.
         </para>
-        <para>When you create, list, update, extend or delete volumes, these status
-            values are possible:</para>
+        <para>When you create, list, update, extend, or delete volumes, the possible status
+            values are:</para>
         <table rules="all" frame="border">
             <caption>Volume statuses</caption>
             <col width="30%"/>

api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl

@@ -58,8 +58,11 @@
                     type="xsd:string" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The cinder host on which the existing
-                            volume resides.</para></wadl:doc>
+                        <para>
+                            The OpenStack Block Storage host where the
+                            existing volume resides.
+                        </para>
+                    </wadl:doc>
                 </param>
                 <param name="ref" style="plain" type="xsd:string"
                     required="true">