diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index 3698deb75..66081dcbf 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -14,10 +14,10 @@ Configuration
   configuration guides for various parts of you Nova system. Helpful reference
   for setting up specific hypervisor backends.
 
-* :doc:`Config Reference </configuration/config>`: A complete reference of all
+* :doc:`Config Reference <config>`: A complete reference of all
   configuration options available in the ``nova.conf`` file.
 
-* :doc:`Sample Config File </configuration/sample-config>`: A sample config
+* :doc:`Sample Config File <sample-config>`: A sample config
   file with inline documentation.
 
 Policy
@@ -26,8 +26,20 @@ Policy
 Nova, like most OpenStack projects, uses a policy language to restrict
 permissions on REST API actions.
 
-* :doc:`Policy Reference </configuration/policy>`: A complete reference of all
+* :doc:`Policy Reference <policy>`: A complete reference of all
   policy points in nova and what they impact.
 
-* :doc:`Sample Policy File </configuration/sample-policy>`: A sample policy
+* :doc:`Sample Policy File <sample-policy>`: A sample policy
   file with inline documentation.
+
+
+.. # NOTE(mriedem): This is the section where we hide things that we don't
+   # actually want in the table of contents but sphinx build would fail if
+   # they aren't in the toctree somewhere.
+.. toctree::
+   :hidden:
+
+   config
+   sample-config
+   policy
+   sample-policy
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 5600286dc..fec5c4b27 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -180,27 +180,8 @@ Reference Material
 
 * :doc:`Nova CLI Command References </cli/index>`: the complete command reference
   for all the daemons and admin tools that come with nova.
-
-* **Configuration**:
-
-  * :doc:`Configuration Guide </admin/configuration/index>`: detailed
-    configuration guides for various parts of you Nova system. Helpful
-    reference for setting up specific hypervisor backends.
-
-  * :doc:`Config Reference </configuration/config>`: a complete reference of all
-    configuration options available in the nova.conf file.
-
-  * :doc:`Sample Config File </configuration/sample-config>`: a sample config file
-    with inline documentation.
-
-* **Policy**: nova, like most OpenStack projects, uses a policy language to
-  restrict permissions on REST API actions.
-
-  * :doc:`Policy Reference </configuration/policy>`: a complete reference of all
-    policy points in nova and what they impact.
-
-  * :doc:`Sample Policy File </configuration/sample-policy>`: a sample policy file
-    with inline documentation.
+* :doc:`Configuration Guide <configuration/index>`: Information on configuring
+  the system, including role-based access control policy rules.
 
 For Contributors
 ================
@@ -233,10 +214,6 @@ looking parts of our architecture. These are collected below.
    admin/configuration/index
    cli/index
    configuration/index
-   configuration/config
-   configuration/sample-config
-   configuration/policy
-   configuration/sample-policy
    contributor/development-environment
    contributor/api
    contributor/api-2