diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index c9786ad5d0..a6ed01698a 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -102,7 +102,7 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
         <glossentry>
             <glossterm>accounting</glossterm>
             <glossdef>
-                <para>The Compute Service  provides accounting information
+                <para>The Compute Service provides accounting information
                     through the event notification and system usage data
                     facilities.</para>
             </glossdef>
@@ -188,7 +188,7 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
         <glossentry>
             <glossterm>alert</glossterm>
             <glossdef>
-                <para>The Compute Service  can send alerts through its
+                <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>
@@ -691,12 +691,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     there are usually 8 bits to a byte.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .C. -->
     <glossdiv>
@@ -1252,12 +1246,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     dashboard.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .D. -->
     <glossdiv>
@@ -2031,12 +2019,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     a command line tool.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .G. -->
     <glossdiv>
@@ -2283,12 +2265,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     through host aggregates.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .I. -->
     <glossdiv>
@@ -2626,12 +2602,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     project.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .J. -->
     <glossdiv>
@@ -2671,12 +2641,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
             <para>Project name for the tenth release of OpenStack.</para>
           </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .K. -->
     <glossdiv>
@@ -2782,12 +2746,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     availability.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .M. -->
     <glossdiv>
@@ -2949,12 +2907,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     connected to it.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .N. -->
     <glossdiv>
@@ -3174,7 +3126,7 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
             </glossdef>
         </glossentry>
         <glossentry>
-            <glossterm>nova network</glossterm>
+            <glossterm>nova-network</glossterm>
             <glossdef>
                 <para>A Compute component that manages IP address
                     allocation, firewalls, and other network-related
@@ -3322,12 +3274,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                 </para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm>OpenStack API (OSAPI)</glossterm>
-            <glossdef>
-                <para>The core OpenStack API.</para>
-            </glossdef>
-        </glossentry>
         <glossentry>
             <glossterm>openSUSE</glossterm>
             <glossdef>
@@ -4599,13 +4545,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     services to applications.</para>
             </glossdef>
         </glossentry>
-
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .U. -->
     <glossdiv>
@@ -4656,12 +4595,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                 <para>An OpenStack-supported hypervisor.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .V. -->
     <glossdiv>
@@ -4918,12 +4851,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                 <para>An OpenStack-supported hypervisor.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .W. -->
     <glossdiv>
@@ -4960,12 +4887,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     storage to instances.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .X. -->
     <glossdiv>
@@ -4997,12 +4918,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                 <para>An OpenStack-supported hypervisor.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- .Y. -->
     <glossdiv>
@@ -5033,12 +4948,6 @@ Each entry in a typical ACL specifies a subject and an operation. For instance,
                     parallel.</para>
             </glossdef>
         </glossentry>
-        <glossentry>
-            <glossterm/>
-            <glossdef>
-                <para/>
-            </glossdef>
-        </glossentry>
     </glossdiv>
     <!-- ... -->
 </glossary>