diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst
index fc55f9ee7b..cd18083c67 100644
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -34,12 +34,6 @@
      notification bus and transforms them into Ceilometer samples. This
      is the preferred method of data collection.
 
-   ceilometer
-     From Wikipedia [#]_:
-
-       A ceilometer is a device that uses a laser or other light
-       source to determine the height of a cloud base.
-
    polling agent
      Software service running either on a central management node within the
      OpenStack infrastructure or compute node measuring usage and sending the
@@ -59,10 +53,10 @@
      number of disk io requests, etc.
      Three types of meters are defined in ceilometer:
 
-       * Cumulative: Increasing over time (e.g. disk I/O)
-       * Gauge: Discrete items (e.g. floating IPs, image uploads) and fluctuating
-         values (e.g. number of Swift objects)
-       * Delta: Incremental change to a counter over time (e.g. bandwidth delta)
+     * Cumulative: Increasing over time (e.g. disk I/O)
+     * Gauge: Discrete items (e.g. floating IPs, image uploads) and fluctuating
+       values (e.g. number of Swift objects)
+     * Delta: Incremental change to a counter over time (e.g. bandwidth delta)
 
    metering
      Metering is the process of collecting information about what,
@@ -77,14 +71,13 @@
      RPC driver.
 
    non-repudiable
-    From Wikipedia [#]_:
-
-      Non-repudiation refers to a state of affairs where the purported
-      maker of a statement will not be able to successfully challenge
-      the validity of the statement or contract. The term is often
-      seen in a legal setting wherein the authenticity of a signature
-      is being challenged. In such an instance, the authenticity is
-      being "repudiated".
+     “Non-repudiation refers to a state of affairs where the purported
+     maker of a statement will not be able to successfully challenge
+     the validity of the statement or contract. The term is often
+     seen in a legal setting wherein the authenticity of a signature
+     is being challenged. In such an instance, the authenticity is
+     being "repudiated".”
+     (Wikipedia, [#]_)
 
    project
      The OpenStack tenant or project.