From aba28a174cea4d0cab2b950337fbe026526a23fe Mon Sep 17 00:00:00 2001
From: Don Domingo <ddomingo@redhat.com>
Date: Wed, 19 Mar 2014 13:30:24 +1000
Subject: [PATCH] Apply service name conventions for Image Service

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

Change-Id: Iefb63673162ae97b2c0fe1c3ff3fb1ac05e95d83
Partial-Bug: #1217503
---
 bk001-ch002-associate-getting-started-quiz.xml | 2 +-
 card127-glance.xml                             | 2 +-
 module001-ch007-keystone-arch.xml              | 4 ++--
 module002-ch001-networking-in-openstack.xml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bk001-ch002-associate-getting-started-quiz.xml b/bk001-ch002-associate-getting-started-quiz.xml
index c691eaec..70627a25 100644
--- a/bk001-ch002-associate-getting-started-quiz.xml
+++ b/bk001-ch002-associate-getting-started-quiz.xml
@@ -129,7 +129,7 @@
                     </listitem>
                     <listitem>
                       <formalpara>
-                        <title>The Image service (Glance) in OpenStack provides: (Choose all that apply)</title>
+                        <title>The Image Service (Glance) in OpenStack provides: (Choose all that apply)</title>
                       <para>
                           <orderedlist>
                             <listitem>
diff --git a/card127-glance.xml b/card127-glance.xml
index d6400f55..91e47ae8 100644
--- a/card127-glance.xml
+++ b/card127-glance.xml
@@ -5,7 +5,7 @@
  version="5.0"
   xml:id="configure-image">
     <title>Install Glance</title>
-  <!-- this maps to user story "Card127 - As an associate trainee I need to be able to install OpenStack the Image service (Glance) on the controller node -->
+  <!-- this maps to user story "Card127 - As an associate trainee I need to be able to install OpenStack the Image Service (Glance) on 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-glance.xml"
     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(/*/*[not(self::db:title)])">
diff --git a/module001-ch007-keystone-arch.xml b/module001-ch007-keystone-arch.xml
index 9a3468e1..095ffc85 100644
--- a/module001-ch007-keystone-arch.xml
+++ b/module001-ch007-keystone-arch.xml
@@ -183,11 +183,11 @@
               <filename>/etc/nova/policy.json</filename> specifies the
             access policy for the Compute service,
               <filename>/etc/glance/policy.json</filename> specifies
-            the access policy for the Image service, and
+            the access policy for the Image Service, and
               <filename>/etc/keystone/policy.json</filename> specifies
             the access policy for the Identity service.</para>
           <para>The default policy.json files in the Compute,
-            Identity, and Image service recognize only the admin role:
+            Identity, and Image Service recognize only the admin role:
             all operations that do not require the admin role will be
             accessible by any user that has any role in a
             tenant.</para>
diff --git a/module002-ch001-networking-in-openstack.xml b/module002-ch001-networking-in-openstack.xml
index 2b3c5188..49f5eec3 100644
--- a/module002-ch001-networking-in-openstack.xml
+++ b/module002-ch001-networking-in-openstack.xml
@@ -141,7 +141,7 @@
         OpenStack services.</para>
     <para>OpenStack Networking is a standalone service, just like
         other OpenStack services such as OpenStack Compute, OpenStack
-        Image service, OpenStack Identity service, and the OpenStack
+        Image Service, OpenStack Identity service, and the OpenStack
         Dashboard. Like those services, a deployment of OpenStack
         Networking often involves deploying several processes on a
         variety of hosts.</para>