diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index f34ad52238..c9ce62cc22 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -1,8 +1,8 @@
 .. _admin:
 
-=====================
- Administrator Guide
-=====================
+===================
+Administrator Guide
+===================
 
 
 Overview
diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst
index 357025491b..92565e4b4c 100644
--- a/doc/source/contributor/architecture.rst
+++ b/doc/source/contributor/architecture.rst
@@ -1,8 +1,8 @@
 .. _architecture:
 
-=====================
- System Architecture
-=====================
+===================
+System Architecture
+===================
 
 .. index::
    single: agent; architecture
diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst
index fd05763662..02e087abbb 100644
--- a/doc/source/contributor/devstack.rst
+++ b/doc/source/contributor/devstack.rst
@@ -1,6 +1,6 @@
-===============================
- Installing development sandbox
-===============================
+==============================
+Installing development sandbox
+==============================
 
 In a development environment created by devstack_, Ceilometer can be tested
 alongside other OpenStack services.
diff --git a/doc/source/contributor/events.rst b/doc/source/contributor/events.rst
index a378bc66cd..726d205fd8 100644
--- a/doc/source/contributor/events.rst
+++ b/doc/source/contributor/events.rst
@@ -15,9 +15,9 @@
 
 .. _events:
 
-=============================
- Events and Event Processing
-=============================
+===========================
+Events and Event Processing
+===========================
 
 Events vs. Samples
 ~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/contributor/measurements.rst b/doc/source/contributor/measurements.rst
index 16b615dadf..c5ee585b7c 100644
--- a/doc/source/contributor/measurements.rst
+++ b/doc/source/contributor/measurements.rst
@@ -15,9 +15,9 @@
 
 .. _measurements:
 
-==============
- Measurements
-==============
+============
+Measurements
+============
 
 Existing meters
 ===============
diff --git a/doc/source/contributor/new_resource_types.rst b/doc/source/contributor/new_resource_types.rst
index 40329431b7..e44e29da5f 100644
--- a/doc/source/contributor/new_resource_types.rst
+++ b/doc/source/contributor/new_resource_types.rst
@@ -15,9 +15,9 @@
 
 .. _add_new_resource_types:
 
-=================================
- Ceilometer + Gnocchi Integration
-=================================
+================================
+Ceilometer + Gnocchi Integration
+================================
 
 .. warning::
 
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
index e89baf0607..e58384dc94 100644
--- a/doc/source/contributor/plugins.rst
+++ b/doc/source/contributor/plugins.rst
@@ -13,9 +13,9 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-=======================
- Writing Agent Plugins
-=======================
+=====================
+Writing Agent Plugins
+=====================
 
 This documentation gives you some clues on how to write a new agent or
 plugin for Ceilometer if you wish to instrument a measurement which
diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst
index cd18083c67..5d2767dfe6 100644
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -14,9 +14,9 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-==========
- Glossary
-==========
+========
+Glossary
+========
 
 .. glossary::
 
diff --git a/doc/source/install/neutron/install-neutron-obs.rst b/doc/source/install/neutron/install-neutron-obs.rst
index 37de9fe594..8cfc24d4bd 100644
--- a/doc/source/install/neutron/install-neutron-obs.rst
+++ b/doc/source/install/neutron/install-neutron-obs.rst
@@ -5,7 +5,7 @@ Telemetry uses notifications to collect Networking service meters. Perform
 these steps on the controller node.
 
 Configure the Networking service to use Telemetry
-----------------------------------------------------
+-------------------------------------------------
 
 * Edit the ``/etc/neutron/neutron.conf`` and complete the following actions:
 
diff --git a/doc/source/install/neutron/install-neutron-rdo.rst b/doc/source/install/neutron/install-neutron-rdo.rst
index 06567d5993..521c19be82 100644
--- a/doc/source/install/neutron/install-neutron-rdo.rst
+++ b/doc/source/install/neutron/install-neutron-rdo.rst
@@ -5,7 +5,7 @@ Telemetry uses notifications to collect Networking service meters. Perform
 these steps on the controller node.
 
 Configure the Networking service to use Telemetry
-----------------------------------------------------
+-------------------------------------------------
 
 * Edit the ``/etc/neutron/neutron.conf`` and complete the following actions:
 
diff --git a/doc/source/install/neutron/install-neutron-ubuntu.rst b/doc/source/install/neutron/install-neutron-ubuntu.rst
index 3dacc8a683..b84d6d8f54 100644
--- a/doc/source/install/neutron/install-neutron-ubuntu.rst
+++ b/doc/source/install/neutron/install-neutron-ubuntu.rst
@@ -5,7 +5,7 @@ Telemetry uses notifications to collect Networking service meters. Perform
 these steps on the controller node.
 
 Configure the Networking service to use Telemetry
-----------------------------------------------------
+-------------------------------------------------
 
 * Edit the ``/etc/neutron/neutron.conf`` and complete the following actions: