From e8707c2cad2e2239af1d84b8aa6583c16cdfa11e Mon Sep 17 00:00:00 2001
From: Don Domingo <ddomingo@redhat.com>
Date: Wed, 19 Mar 2014 13:07:11 +1000
Subject: [PATCH] Apply service name conventions for Block Storage

There are several instances of "Block Storage Service" in the
upstream documentation. As was recently clarified in the docs
mailing list, these should be "Block Storage service". This patch
applies the fix.

Change-Id: I591c100ab031b75f1c0d27d45f53e32401a26e30
Partial-Bug: #1217503
---
 bk001-ch004-associate-controller-node-quiz.xml | 2 +-
 card040-cinder.xml                             | 2 +-
 module001-ch006-overview-horizon-cli.xml       | 4 ++--
 sources/cinder/architecture.xml                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bk001-ch004-associate-controller-node-quiz.xml b/bk001-ch004-associate-controller-node-quiz.xml
index 3209557f..7d17c344 100644
--- a/bk001-ch004-associate-controller-node-quiz.xml
+++ b/bk001-ch004-associate-controller-node-quiz.xml
@@ -329,7 +329,7 @@
                   <listitem>
                     <para>A, D, E - The following command-line clients are available for the respective services' APIs:
 cinder(python-cinderclient)
-Client for the Block Storage Service API. Use to create and manage volumes.
+Client for the Block Storage service API. Use to create and manage volumes.
 glance(python-glanceclient)
 Client for the Image Service API. Use to create and manage images.
 keystone(python-keystoneclient)
diff --git a/card040-cinder.xml b/card040-cinder.xml
index b6abe2da..57a963ca 100644
--- a/card040-cinder.xml
+++ b/card040-cinder.xml
@@ -5,7 +5,7 @@
  version="5.0"
   xml:id="configure-block-storage">
     <title>Install Cinder</title>
-  <!-- this maps to user story "Card040 - As an associate trainee I need to be able to install and configure OpenStack Block Storage Service in the Controller Node -->
+  <!-- this maps to user story "Card040 - As an associate trainee I need to be able to install and configure OpenStack Block Storage service in the Controller Node -->
   <!-- The basic install guide no longer exists. A new include needs to be found -->
 
  <!-- <xi:include href="../install-guide/basic-install-files/basic-install_controller-cinder.xml"
diff --git a/module001-ch006-overview-horizon-cli.xml b/module001-ch006-overview-horizon-cli.xml
index 3e61817d..3de1a8f6 100644
--- a/module001-ch006-overview-horizon-cli.xml
+++ b/module001-ch006-overview-horizon-cli.xml
@@ -882,7 +882,7 @@
       <para>The following command-line clients are available for the
         respective services' APIs:</para>
       <para>cinder(python-cinderclient)</para>
-      <para>Client for the Block Storage Service API. Use to create
+      <para>Client for the Block Storage service API. Use to create
         and manage volumes.</para>
       <para>glance(python-glanceclient)</para>
       <para>Client for the Image Service API. Use to create and manage
@@ -949,7 +949,7 @@
                   <para>swift. Object Storage API.</para>
                 </listitem>
                 <listitem>
-                  <para>cinder. Block Storage Service API.</para>
+                  <para>cinder. Block Storage service API.</para>
                 </listitem>
                 <listitem>
                   <para>heat. Orchestration API.</para>
diff --git a/sources/cinder/architecture.xml b/sources/cinder/architecture.xml
index 8368e6c9..8a4009ea 100644
--- a/sources/cinder/architecture.xml
+++ b/sources/cinder/architecture.xml
@@ -25,7 +25,7 @@
 <section xml:id="Cinder-System-Architecture">
 <title>Block Storage System Architecture</title>
 <para>
-The OpenStack Block Storage Service is intended to run on one or more nodes.
+The OpenStack Block Storage service is intended to run on one or more nodes.
 Block Storage uses a SQL-based central database that is shared by all Block Storage services in the system. The amount and depth of the data fits into a SQL database quite well. For small deployments this seems like an optimal solution.  For larger deployments, and especially if security is a concern, Block Storage will be moving towards multiple data stores with some kind of aggregation system.
 </para>
 </section>