Consistent terminology for XX-as-a-Service

Also changed "Load-Balancing-as-a-Service" to Load-Balancer-as-a-Service

Change-Id: I078cd7b4ad7f9d25c908e2c334efacf8de907e4f
author: diane fleming

doc/admin-guide-cloud/networking/section_networking_introduction.xml

@@ -156,8 +156,8 @@
         </variablelist>
     </section>
     <section xml:id="section_lbaas-overview">
-        <title>Load Balancing-as-a-Service (LBaaS) overview</title>
+        <title>Load-Balancer-as-a-Service (LBaaS) overview</title>
-        <para><glossterm>Load Balancing-as-a-Service
+        <para><glossterm>Load-Balancer-as-a-Service
                 (LBaaS)</glossterm> enables Networking to distribute
             incoming requests evenly among designated instances. This
             distribution ensures that the workload is shared
@@ -917,7 +917,7 @@ nsx_controllers=10.127.0.100,10.127.0.200:8888</programlisting>
                         correct.</para>
                 </note>
                 <section xml:id="LBaaS_and_FWaaS">
-                    <title>Load Balancer-as-a-Service and
+                    <title>Load-Balancer-as-a-Service and
                         Firewall-as-a-Service</title>
                     <para>The NSX LBaaS and FWaaS services use the
                         standard OpenStack API with the exception of
@@ -960,7 +960,7 @@ nsx_controllers=10.127.0.100,10.127.0.200:8888</programlisting>
                         </listitem>
                     </orderedlist>
                     <procedure>
-                        <title>To configure Load Balancer-as-a-Service
+                        <title>To configure Load-Balancer-as-a-Service
                             and Firewall-as-a-Service with NSX</title>
                         <step>
                             <para>Edit the
@@ -1564,9 +1564,9 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
             </procedure>
         </section>
         <section xml:id="install_neutron-lbaas-agent">
-            <title>Configure Load-Balancing-as-a-Service
+            <title>Configure Load-Balancer-as-a-Service
                 (LBaaS)</title>
-            <para>Configure Load-Balancing-as-a-Service (LBaas) with
+            <para>Configure Load-Balancer-as-a-Service (LBaas) with
                 the Open vSwitch or Linux Bridge plug-in. The Open
                 vSwitch LBaaS driver is required when enabling LBaaS
                 for OVS-based plug-ins, including BigSwitch,
@@ -1588,7 +1588,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
                     <programlisting language="ini">service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default</programlisting>
                 </step>
                 <step>
-                    <para>Enable the load balancer plugin using
+                    <para>Enable the load-balancing plug-in using
                             <option>service_plugin</option> in the
                             <filename>/etc/neutron/neutron.conf</filename>
                         file:</para>

doc/common/ch_getstart.xml

@@ -69,7 +69,7 @@
                         xlink:href="http://docs.openstack.org/developer/neutron/"
                         ><glossterm>Neutron</glossterm></link>
                 </td>
-                <td>Enables network connectivity as a service for
+                <td>Enables Network-Connectivity-as-a-Service for
                     other OpenStack services, such as OpenStack Compute.
                     Provides an API for users to define networks and the
                     attachments into them. Has a pluggable architecture

doc/common/section_getstart_compute.xml

@@ -5,7 +5,7 @@
   <title>OpenStack Compute</title>
   <para>Use OpenStack Compute to host and manage cloud computing
     systems. OpenStack Compute is a major part of an
-    infrastructure-as-a-service (IaaS) system. The main modules are
+    Infrastructure-as-a-Service (IaaS) system. The main modules are
     implemented in Python.</para>
   <para>OpenStack Compute interacts with OpenStack Identity for
     authentication, OpenStack Image Service for disk and server

doc/common/section_getstart_image.xml

@@ -3,7 +3,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="image-service-overview">
       <title>OpenStack Image Service</title>
-      <para>The OpenStack Image Service is central to infrastructure-as-a-service (IaaS)
+      <para>The OpenStack Image Service is central to Infrastructure-as-a-Service (IaaS)
         as shown in <xref linkend="conceptual-architecture"/>. It accepts API requests
         for disk or server images, and image metadata from end users or OpenStack Compute
         components. It also supports the storage of disk or server images on various

doc/config-reference/networking/section_networking-log-files.xml

@@ -47,7 +47,7 @@
             <footnote xml:id="fn_log-lbaas-agent">
             <para>The
             <systemitem class="service">neutron-lbaas-agent</systemitem>
-            service only runs when Load Balancer as a Service is
+            service only runs when Load-Balancer-as-a-Service is
             enabled.</para></footnote>
             </td>
         </tr>

doc/config-reference/networking/section_networking-options-reference.xml

@@ -54,7 +54,7 @@
 <section xml:id="networking-options-embrane_lb">
 <title>Embrane LBaaS driver</title>
 <para>Use the following options to alter Embrane
-Loadbalancer-as-a-Service related settings.</para>
+Load-Balancer-as-a-Service related settings.</para>
 <xi:include href="../../common/tables/neutron-embrane_lb.xml"/>
 </section>
 
@@ -73,7 +73,7 @@ Loadbalancer-as-a-Service related settings.</para>
 </section>
 
 <section xml:id="networking-options-lbaas">
-<title>Loadbalancer-as-a-Service agent</title>
+<title>Load-Balancer-as-a-Service agent</title>
 <para>Use the following options in the <filename>lbaas_agent.ini</filename>
     file for the LbaaS agent.</para>
 <xi:include href="../../common/tables/neutron-lbaas.xml"/>

doc/glossary/glossary-terms.xml

@@ -4229,9 +4229,9 @@
     </glossentry>
 
     <glossentry>
-      <glossterm>Load-Balancing-as-a-Service (LBaaS)<indexterm
+      <glossterm>Load-Balancer-as-a-Service (LBaaS)<indexterm
           class="singular">
-          <primary>Load-Balancing-as-a-Service (LBaaS)</primary>
+          <primary>Load-Balancer-as-a-Service (LBaaS)</primary>
         </indexterm></glossterm>
 
       <glossdef>

doc/high-availability-guide/ha_aa_controllers/section_run_openstack_api_and_schedulers.xml

@@ -11,7 +11,7 @@
           </info>
           <simpara>All OpenStack projects have an API service for controlling all the resources in the Cloud.
 In Active / Active mode, the most common setup is to scale-out these services on at least two nodes
-and use load-balancing and virtual IP (with HAproxy &amp; Keepalived in this setup).</simpara>
+and use load balancing and virtual IP (with HAproxy &amp; Keepalived in this setup).</simpara>
           <simpara>
             <emphasis role="strong">Configure API OpenStack services</emphasis>
           </simpara>

doc/install-guide/section_neutron-concepts.xml

@@ -56,7 +56,7 @@
     not vital to operating Networking, understanding these concepts
     can help you set up Networking. All Networking installations use a
     core plug-in and a security group plug-in (or just the No-Op
-    security group plug-in). Additionally, Firewall as a Service
+    security group plug-in). Additionally, Firewall-as-a-Service
-    (FWaaS) and Load Balancer as a Service (LBaaS) plug-ins are
+    (FWaaS) and Load-Balancer-as-a-Service (LBaaS) plug-ins are
     available.</para>
 </section>