Merge "Added Doc conventions to glossary."

openstack · Dec 3, 2013 · f5c76d1 · f5c76d1
2 parents b095baf + 4e672cc
commit f5c76d1
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
@@ -101,8 +101,8 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
         <glossentry>
             <glossterm>accounting</glossterm>
             <glossdef>
-                <para>Nova provides accounting information through the
-                    event notification and system usage data
+                <para>The Compute Service  provides accounting information
+                    through the event notification and system usage data
                     facilities.</para>
             </glossdef>
         </glossentry>
@@ -166,10 +166,10 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
         <glossentry>
             <glossterm>alert</glossterm>
             <glossdef>
-                <para>Nova can send alerts through its notification
-                    system, which includes a facility to create custom
-                    notification drivers. Alerts can be sent to and
-                    displayed on the horizon dashboard.</para>
+                <para>The Compute Service  can send alerts through its
+                    notification system, which includes a facility to
+                    create custom notification drivers. Alerts can be
+                    sent to and displayed on the horizon dashboard.</para>
             </glossdef>
         </glossentry>
         <glossentry>
@@ -869,8 +869,8 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
         <glossentry>
             <glossterm>Cinder</glossterm>
             <glossdef>
-                <para>A core OpenStack project that maintains the nova
-                    Volume Service for VMs.</para>
+                <para>A core OpenStack project that maintains the object
+                    storage services for VMs.</para>
             </glossdef>
         </glossentry>
         <glossentry>
@@ -2805,7 +2805,7 @@ daemon that provides
         <glossentry>
             <glossterm>Modular Layer 2 (ML2) neutron plug-in</glossterm>
             <glossdef>
-                <para>A Neutron plug-in that can concurrently use multiple
+                <para>A Networking plug-in that can concurrently use multiple
                     layer 2 networking technologies such as 802.1Q and
                     VXLAN.</para>
             </glossdef>