Replace 'Database Service' and 'Database module' with 'Database service'

According to our conventions
(https://wiki.openstack.org/wiki/Documentation/Conventions) the
correct  capitalization is 'Database service'.

Change-Id: I49b7a2c3828255dc13f5661a2fd61fc278280100

doc/arch-design/hybrid/section_architecture_hybrid.xml

@@ -85,7 +85,7 @@
                 platforms that do not support a given service, create
                 a service on top of that platform and apply it to the
                 workloads as they are launched on that cloud.</para>
-            <para>For example, through the <glossterm>Database Service</glossterm>
+            <para>For example, through the <glossterm>Database service</glossterm>
                 for OpenStack (<glossterm>trove</glossterm>),
                 OpenStack supports MySQL as a service but not NoSQL
                 databases in production. To either move from or run

doc/common/app_support.xml

@@ -293,7 +293,7 @@
             <listitem>
                 <para><link
                         xlink:href="https://bugs.launchpad.net/trove"
-                        >Bugs: Database Service (trove)</link></para>
+                        >Bugs: Database service (trove)</link></para>
             </listitem>
             <listitem>
                 <para><link

doc/common/ch_getstart.xml

@@ -171,7 +171,7 @@
             <tr>
                 <td><link
                         xlink:href="http://www.openstack.org/software/openstack-shared-services/"
-                        ><glossterm>Database Service</glossterm></link>
+                        ><glossterm>Database service</glossterm></link>
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/trove/"

doc/common/section_cli_install.xml

@@ -202,7 +202,7 @@
                     API</para>
             </listitem>
             <listitem>
-                <para><literal>trove</literal> - Database Service
+                <para><literal>trove</literal> - Database service
                     API</para>
             </listitem>
             <listitem>

doc/common/section_cli_overview.xml

@@ -57,7 +57,7 @@
                 <td>Create and manage images, instances, and flavors.</td>
             </tr>
             <tr>
-                <td>Database Service</td>
+                <td>Database service</td>
                 <td><command>trove</command></td>
                 <td><package>python-troveclient</package></td>
                 <td>Create and manage databases.</td>

doc/common/tables/trove-conf-changes.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="trove-conf-changes-kilo">
   <!-- Warning: Do not edit this file. It is automatically generated and your changes will be overwritten. The tool to do so lives in the openstack-doc-tools repository. -->
-  <title>New, updated and deprecated options in Kilo for Database Service</title>
+  <title>New, updated and deprecated options in Kilo for Database service</title>
   <table>
     <caption>New options</caption>
     <col width="50%"/>

doc/config-reference/bk-config-ref.xml

@@ -69,7 +69,7 @@
                             <para>Update for Icehouse: Updated all
                             configuration tables, include sample
                             configuration files, add chapters for
-                            Database Service, Orchestration, and
+                            Database service, Orchestration, and
                             Telemetry.
                             </para>
                         </listitem>
@@ -148,7 +148,7 @@
     <xi:include href="ch_computeconfigure.xml"/>
     <!-- Dashboard -->
     <xi:include href="ch_dashboardconfigure.xml"/>
-    <!-- Database Service -->
+    <!-- Database service -->
     <xi:include href="ch_databaseserviceconfigure.xml"/>
     <!-- Data processing service -->
     <xi:include href="ch_dataprocessingserviceconfigure.xml"/>

doc/config-reference/ch_config-overview.xml

@@ -17,7 +17,7 @@
         <listitem><para>OpenStack Block Storage</para></listitem>
         <listitem><para>OpenStack Compute</para></listitem>
         <listitem><para>OpenStack Dashboard</para></listitem>
-        <listitem><para>Database Service</para></listitem>
+        <listitem><para>Database service</para></listitem>
         <listitem><para>OpenStack Identity</para></listitem>
         <listitem><para>OpenStack Image Service</para></listitem>
         <listitem><para>OpenStack Networking</para></listitem>

doc/config-reference/ch_databaseserviceconfigure.xml

@@ -4,13 +4,13 @@
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
   xml:id="ch_configuring-trove">
-  <title>Database Service</title>
+  <title>Database service</title>
-  <para>The Database Service provides a scalable and reliable Cloud
+  <para>The Database service provides a scalable and reliable Cloud
   Database-as-a-Service functionality for both relational and
   non-relational database engines.</para>
 
   <para>The following tables provide a comprehensive list of the
-      Database Service configuration options.</para>
+      Database service configuration options.</para>
 
       <xi:include href="../common/tables/trove-api.xml"/>
       <xi:include href="../common/tables/trove-auth_token.xml"/>

doc/glossary/glossary-terms.xml

@@ -2089,7 +2089,7 @@
         (keystone), Dashboard (horizon), Networking (neutron), and Block
         Storage (cinder). The Telemetry module (ceilometer) and Orchestration
         module (heat) are integrated projects as of the Havana release. In the
-        Icehouse release, the Database module (trove) gains integrated project
+        Icehouse release, the Database service (trove) gains integrated project
         status.</para>
       </glossdef>
     </glossentry>
@@ -2278,9 +2278,9 @@
     </glossentry>
 
     <glossentry>
-      <glossterm>Database Service</glossterm>
+      <glossterm>Database service</glossterm>
       <indexterm class="singular">
-          <primary>Database Service</primary>
+          <primary>Database service</primary>
         </indexterm>
 
       <glossdef>
@@ -2288,7 +2288,7 @@
           An integrated project that provide scalable and reliable
           Cloud Database-as-a-Service functionality for both
           relational and non-relational database engines. The project
-          name of Database Service is trove.
+          name of Database service is trove.
         </para>
       </glossdef>
     </glossentry>

doc/install-guide/bk-openstack-install-guide.xml

@@ -116,7 +116,7 @@
                         <listitem>
                             <para>Update for Icehouse, rework
                             Networking setup to use ML2 as plugin, add
-                            new chapter for Database Service setup,
+                            new chapter for Database service setup,
                             improved basic configuration.</para>
                         </listitem>
                     </itemizedlist>

doc/install-guide/ch_trove.xml

@@ -5,8 +5,8 @@
   version="5.0"
   xml:id="ch_trove">
   <title>Add the Database service</title>
-       <para>Use the <glossterm baseform="Database Service">Database
+       <para>Use the <glossterm baseform="Database service">Database
-          module</glossterm> to create cloud database resources. The
+          service</glossterm> to create cloud database resources. The
           integrated project name is <glossterm>trove</glossterm>.</para>
        <warning><para>This chapter is a work in progress. It may contain
           incorrect information, and will be updated frequently.</para></warning>

doc/install-guide/section_basics-security.xml

@@ -118,7 +118,7 @@
        </tr>
        <tr>
          <td><literal><replaceable>TROVE_PASS</replaceable></literal></td>
-         <td>Password of Database Service user <literal>trove</literal></td>
+         <td>Password of Database service user <literal>trove</literal></td>
        </tr>
      </tbody>
    </table>

doc/install-guide/section_trove-install.xml

@@ -5,7 +5,7 @@
   version="5.0"
   xml:id="trove-install">
   <title>Install the Database service</title>
-  <para>This procedure installs the Database module on the controller
+  <para>This procedure installs the Database service on the controller
   node.</para>
   <formalpara>
     <title>Prerequisites</title>
@@ -21,7 +21,7 @@
       <para>If you want to provision datastores on block-storage volumes, you also need Block Storage.</para>
     </listitem>
   </itemizedlist>
-  <para>To install the Database module on the controller:</para>
+  <para>To install the Database service on the controller:</para>
   <procedure>
     <step>
       <para>Install required packages:</para>
@@ -94,7 +94,7 @@ notifier_queue_hostname = <replaceable>controller</replaceable></programlisting>
         </step>
 
         <step>
-          <para>Configure the Database module to use the RabbitMQ message broker by
+          <para>Configure the Database service to use the RabbitMQ message broker by
           setting the following options in the <literal>[DEFAULT]</literal>
           configuration group of each file:</para>
           <programlisting language="ini">[DEFAULT]
@@ -208,11 +208,11 @@ log_file = trove-guestagent.log</programlisting>
     </step>
 
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
-      <para>You must register the Database module with the Identity service so
+      <para>You must register the Database service with the Identity service so
       that other OpenStack services can locate it. Register the
       service and specify the endpoint:</para>
       <screen><prompt>$</prompt> <userinput>keystone service-create --name trove --type database \
-  --description "OpenStack Database Service"</userinput>
+  --description "OpenStack Database service"</userinput>
 <prompt>$</prompt> <userinput>keystone endpoint-create \
   --service-id $(keystone service-list | awk '/ trove / {print $2}') \
   --publicurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \

doc/user-guide/bk-user-guide.xml

@@ -52,7 +52,7 @@
                             <para>
                               For the Juno release, this guide has
                               been updated with information about
-                              the Database Service for OpenStack (trove).
+                              the Database service for OpenStack (trove).
                             </para>
                         </listitem>
                     </itemizedlist>

doc/user-guides/source/common/app_support.rst

@@ -176,7 +176,7 @@ The following Launchpad Bugs areas are available:
 -  `Bugs: Data Processing Service
    (sahara) <https://bugs.launchpad.net/sahara>`__
 
--  `Bugs: Database Service (trove) <https://bugs.launchpad.net/trove>`__
+-  `Bugs: Database service (trove) <https://bugs.launchpad.net/trove>`__
 
 -  `Bugs: Orchestration (heat) <https://bugs.launchpad.net/heat>`__
 

doc/user-guides/source/common/cli_install_openstack_command_line_clients.rst

@@ -161,7 +161,7 @@ for each client. The following values are valid:
 
 -  ``swift`` - Object Storage API
 
--  ``trove`` - Database Service API
+-  ``trove`` - Database service API
 
 -  ``openstack`` - Common OpenStack client supporting multiple services
 

doc/user-guides/source/common/cli_overview.rst

@@ -38,7 +38,7 @@ service with its package name and description.
 |                |          |                       |images, instances, and  |
 |                |          |                       |flavors.                |
 +----------------+----------+-----------------------+------------------------+
-|Database Service|trove     |python-troveclient     |Create and manage       |
+|Database service|trove     |python-troveclient     |Create and manage       |
 |                |          |                       |databases.              |
 +----------------+----------+-----------------------+------------------------+
 |Identity        |keystone  |python-keystoneclient  |Create and manage users,|

doc/user-guides/source/enduser/backup_db_incremental.rst

@@ -10,7 +10,7 @@ start with a regular backup. Then, when you want to create a subsequent
 incremental backup, you specify the parent backup.
 
 Restoring a database instance from an incremental backup is the same as
-creating a database instance from a regular backup—the Database Service
+creating a database instance from a regular backup—the Database service
 handles the complexities of applying the chain of incremental backups.
 
 This example shows you how to use incremental backups with a MySQL
@@ -100,7 +100,7 @@ Create and use incremental backups
 
    To incorporate your incremental backups, you simply use the
    ``--backup`` parameter to pass in the ``BACKUP_ID`` of your most
-   recent incremental backup. The Database Service handles the
+   recent incremental backup. The Database service handles the
    complexities of applying the chain of all previous incremental
    backups.
 

doc/user-guides/source/enduser/trove-manage-db.rst

@@ -4,7 +4,7 @@
 ===========================
 Create and manage databases
 ===========================
-The Database Service provides scalable and reliable cloud provisioning
+The Database service provides scalable and reliable cloud provisioning
 functionality for both relational and non-relational database engines.
 Users can quickly and easily use database features without the burden of
 handling complex administrative tasks.