Cleanups to doc process.

11 files changed, 137 insertions, 41 deletions

diff --git a/doc/source/devref/api.rst b/doc/source/devref/api.rst
index e9b79d8dd..14181529a 100644
--- a/doc/source/devref/api.rst
+++ b/doc/source/devref/api.rst
@@ -27,8 +27,8 @@ Common Components
 
 The :mod:`nova.api` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 .. automodule:: nova.api
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -37,6 +37,7 @@ The :mod:`nova.api.cloud` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.cloud
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -47,6 +48,7 @@ OpenStack API
 The :mod:`openstack` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -54,6 +56,7 @@ The :mod:`openstack` Module
 The :mod:`auth` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.auth
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -61,6 +64,7 @@ The :mod:`auth` Module
 The :mod:`backup_schedules` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.backup_schedules
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -68,6 +72,7 @@ The :mod:`backup_schedules` Module
 The :mod:`faults` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.faults
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -75,6 +80,7 @@ The :mod:`faults` Module
 The :mod:`flavors` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.flavors
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -82,6 +88,7 @@ The :mod:`flavors` Module
 The :mod:`images` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.images
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -89,6 +96,7 @@ The :mod:`images` Module
 The :mod:`ratelimiting` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.ratelimiting
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -96,6 +104,7 @@ The :mod:`ratelimiting` Module
 The :mod:`servers` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.servers
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -103,6 +112,7 @@ The :mod:`servers` Module
 The :mod:`sharedipgroups` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. automodule:: nova.api.openstack.sharedipgroups
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -114,6 +124,7 @@ The :mod:`nova.api.ec2` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -122,6 +133,7 @@ The :mod:`admin` Module
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2.admin
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -130,6 +142,7 @@ The :mod:`apirequest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2.apirequest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -138,6 +151,7 @@ The :mod:`cloud` Module
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2.cloud
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -146,6 +160,7 @@ The :mod:`images` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2.images
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -154,6 +169,7 @@ The :mod:`metadatarequesthandler` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.api.ec2.metadatarequesthandler
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -165,6 +181,7 @@ The :mod:`api_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -173,6 +190,7 @@ The :mod:`api_integration` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api_integration
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -181,6 +199,7 @@ The :mod:`cloud_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.cloud_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -189,6 +208,7 @@ The :mod:`api.fakes` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.fakes
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -197,6 +217,7 @@ The :mod:`api.test_wsgi` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.test_wsgi
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -205,6 +226,7 @@ The :mod:`test_api` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_api
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -213,6 +235,7 @@ The :mod:`test_auth` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_auth
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -221,6 +244,7 @@ The :mod:`test_faults` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_faults
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -229,6 +253,7 @@ The :mod:`test_flavors` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_flavors
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -237,6 +262,7 @@ The :mod:`test_images` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_images
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -245,6 +271,7 @@ The :mod:`test_ratelimiting` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_ratelimiting
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -253,6 +280,7 @@ The :mod:`test_servers` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_servers
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -261,6 +289,7 @@ The :mod:`test_sharedipgroups` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.api.openstack.test_sharedipgroups
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/auth.rst b/doc/source/devref/auth.rst
index ee82df5ab..c3af3f945 100644
--- a/doc/source/devref/auth.rst
+++ b/doc/source/devref/auth.rst
@@ -21,18 +21,20 @@ Authentication and Authorization
 ================================
 
 The :mod:`nova.quota` Module
------------------------
+----------------------------
 
 .. automodule:: nova.quota
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.auth.signer` Module
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.auth.signer
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -42,26 +44,29 @@ Auth Manager
 ------------
 
 The :mod:`nova.auth.manager` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.auth.manager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.auth.ldapdriver` Driver
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.auth.ldapdriver
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 The :mod:`nova.auth.dbdriver` Driver
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.auth.dbdriver
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -75,6 +80,7 @@ The :mod:`auth_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.auth_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -84,6 +90,7 @@ The :mod:`access_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.access_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -93,6 +100,7 @@ The :mod:`quota_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.quota_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/compute.rst b/doc/source/devref/compute.rst
index 741ea6041..db9ef6f34 100644
--- a/doc/source/devref/compute.rst
+++ b/doc/source/devref/compute.rst
@@ -28,51 +28,57 @@ a specific virtualization backend, read Drivers_.
 
 
 The :mod:`nova.compute.manager` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.compute.manager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 The :mod:`nova.virt.connection` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.virt.connection
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 The :mod:`nova.compute.disk` Module
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.compute.disk
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 The :mod:`nova.virt.images` Module
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.virt.images
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.compute.instance_types` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.compute.instance_types
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.compute.power_state` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.compute.power_state
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -86,6 +92,7 @@ The :mod:`nova.virt.libvirt_conn` Driver
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.virt.libvirt_conn
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -95,6 +102,7 @@ The :mod:`nova.virt.xenapi` Driver
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.virt.xenapi
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -104,6 +112,7 @@ The :mod:`nova.virt.fake` Driver
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.virt.fake
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -113,9 +122,10 @@ Monitoring
 ----------
 
 The :mod:`nova.compute.monitor` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.compute.monitor
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -128,6 +138,7 @@ The :mod:`compute_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.compute_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -136,6 +147,7 @@ The :mod:`virt_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.virt_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/database.rst b/doc/source/devref/database.rst
index 1b41990ab..14559aa8c 100644
--- a/doc/source/devref/database.rst
+++ b/doc/source/devref/database.rst
@@ -19,9 +19,10 @@ The Database Layer
 ==================
 
 The :mod:`nova.db.api` Module
----------------------
+-----------------------------
 
 .. automodule:: nova.db.api
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -34,11 +35,13 @@ The :mod:`nova.db.sqlalchemy.api` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.db.sqlalchemy.api
+    :noindex:
 
 The :mod:`nova.db.sqlalchemy.models` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.db.sqlalchemy.models
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -47,6 +50,7 @@ The :mod:`nova.db.sqlalchemy.session` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.db.sqlalchemy.session
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/fakes.rst b/doc/source/devref/fakes.rst
index adba57969..0ba5d6ef2 100644
--- a/doc/source/devref/fakes.rst
+++ b/doc/source/devref/fakes.rst
@@ -25,46 +25,50 @@ fake implementations of various drivers let you get on with your day.
 
 
 The :mod:`nova.virt.fake` Module
----------------------------
+--------------------------------
 
 .. automodule:: nova.virt.fake
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
-    :noindex:
 
 
 The :mod:`nova.auth.fakeldap` Module
---------------------------
+------------------------------------
 
 .. automodule:: nova.auth.fakeldap
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
     
 
 The :mod:`nova.fakerabbit` Module
-----------------------------
+---------------------------------
 
 .. automodule:: nova.fakerabbit
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :class:`nova.volume.driver.FakeAOEDriver` Class
---------------------------------
+---------------------------------------------------
 
 .. autoclass:: nova.volume.driver.FakeAOEDriver
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :class:`nova.tests.service_unittest.FakeManager` Class
------------------------------------------------
+----------------------------------------------------------
 
 .. autoclass:: nova.tests.service_unittest.FakeManager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -74,6 +78,7 @@ The :mod:`nova.tests.api.openstack.fakes` Module
 ------------------------------------------------
 
 .. automodule:: nova.tests.api.openstack.fakes
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/glance.rst b/doc/source/devref/glance.rst
index 8a9dd7d80..d18f7fec6 100644
--- a/doc/source/devref/glance.rst
+++ b/doc/source/devref/glance.rst
@@ -19,9 +19,10 @@ Glance Integration - The Future of File Storage
 ===============================================
 
 The :mod:`nova.image.service` Module
--------------------------------
+------------------------------------
 
 .. automodule:: nova.image.service
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/network.rst b/doc/source/devref/network.rst
index 9b70b7830..d9d091494 100644
--- a/doc/source/devref/network.rst
+++ b/doc/source/devref/network.rst
@@ -28,6 +28,7 @@ The :mod:`nova.network.manager` Module
 --------------------------------------
 
 .. automodule:: nova.network.manager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -36,6 +37,7 @@ The :mod:`nova.network.linux_net` Driver
 ----------------------------------------
 
 .. automodule:: nova.network.linux_net
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -47,6 +49,7 @@ The :mod:`network_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.network_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/nova.rst b/doc/source/devref/nova.rst
index ff2b6ce9f..53ce6f34f 100644
--- a/doc/source/devref/nova.rst
+++ b/doc/source/devref/nova.rst
@@ -23,108 +23,120 @@ very well yet.
 
 
 The :mod:`nova.adminclient` Module
------------------------------
+----------------------------------
 
 .. automodule:: nova.adminclient
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.context` Module
--------------------------
+------------------------------
 
 .. automodule:: nova.context
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.exception` Module
----------------------------
+--------------------------------
 
 .. automodule:: nova.exception
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.flags` Module
------------------------
+----------------------------
 
 .. automodule:: nova.flags
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.process` Module
--------------------------
+------------------------------
 
 .. automodule:: nova.process
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.rpc` Module
----------------------
+--------------------------
 
 .. automodule:: nova.rpc
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.server` Module
-------------------------
+-----------------------------
 
 .. automodule:: nova.server
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.test` Module
-----------------------
+---------------------------
 
 .. automodule:: nova.test
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:  
 
 
 The :mod:`nova.twistd` Module
-------------------------
+-----------------------------
 
 .. automodule:: nova.twistd
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:  
 
 
 The :mod:`nova.utils` Module
------------------------
+----------------------------
 
 .. automodule:: nova.utils
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.validate` Module
---------------------------
+-------------------------------
 
 .. automodule:: nova.validate
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.wsgi` Module
-----------------------
+---------------------------
 
 .. automodule:: nova.wsgi
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -137,6 +149,7 @@ The :mod:`declare_flags` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.declare_flags
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -146,6 +159,7 @@ The :mod:`fake_flags` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.fake_flags
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -155,6 +169,7 @@ The :mod:`flags_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.flags_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -164,6 +179,7 @@ The :mod:`process_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.process_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -173,6 +189,7 @@ The :mod:`real_flags` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.real_flags
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -182,6 +199,7 @@ The :mod:`rpc_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.rpc_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -191,6 +209,7 @@ The :mod:`runtime_flags` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.runtime_flags
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -200,6 +219,7 @@ The :mod:`twistd_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.twistd_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -209,6 +229,7 @@ The :mod:`validator_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.validator_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/objectstore.rst b/doc/source/devref/objectstore.rst
index 473f32026..3ccfc8566 100644
--- a/doc/source/devref/objectstore.rst
+++ b/doc/source/devref/objectstore.rst
@@ -19,36 +19,40 @@ Objectstore - File Storage Service
 ==================================
 
 The :mod:`nova.objectstore.handler` Module
--------------------------
+------------------------------------------
 
 .. automodule:: nova.objectstore.handler
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.objectstore.bucket` Module
-------------------------
+-----------------------------------------
 
 .. automodule:: nova.objectstore.bucket
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.objectstore.stored` Module
-------------------------
+-----------------------------------------
 
 .. automodule:: nova.objectstore.stored
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.objecstore.image` Module
------------------------
+----------------------------------------
 
 .. automodule:: nova.objectstore.image
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -61,6 +65,7 @@ The :mod:`objectstore_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.objectstore_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/scheduler.rst b/doc/source/devref/scheduler.rst
index d3a6132e5..ab74b6ba8 100644
--- a/doc/source/devref/scheduler.rst
+++ b/doc/source/devref/scheduler.rst
@@ -19,36 +19,40 @@ Scheduler
 =========
 
 The :mod:`nova.scheduler.manager` Module
--------------------------
+----------------------------------------
 
 .. automodule:: nova.scheduler.manager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.scheduler.driver` Module
-------------------------
+---------------------------------------
 
 .. automodule:: nova.scheduler.driver
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.scheduler.chance` Driver
-------------------------
+---------------------------------------
 
 .. automodule:: nova.scheduler.chance
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
 
 The :mod:`nova.scheduler.simple` Driver
-------------------------
+---------------------------------------
 
 .. automodule:: nova.scheduler.simple
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -61,6 +65,7 @@ The :mod:`scheduler_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.scheduler_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/devref/volume.rst b/doc/source/devref/volume.rst
index abec38ba8..54a2d4f8b 100644
--- a/doc/source/devref/volume.rst
+++ b/doc/source/devref/volume.rst
@@ -25,6 +25,7 @@ The :mod:`nova.volume.manager` Module
 -------------------------------------
 
 .. automodule:: nova.volume.manager
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -33,6 +34,7 @@ The :mod:`nova.volume.driver` Module
 -------------------------------------
 
 .. automodule:: nova.volume.driver
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
@@ -45,6 +47,7 @@ The :mod:`volume_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. automodule:: nova.tests.volume_unittest
+    :noindex:
     :members:
     :undoc-members:
     :show-inheritance: