diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
index 1b538b4b47..7ffaea4b9b 100644
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -86,18 +86,22 @@ which are thin wrapper classes which load the appropriate service driver based
 on the keystone configuration.
 
 * Identity
+
  * :mod:`keystone.identity.core.TenantController`
  * :mod:`keystone.identity.core.UserController`
  * :mod:`keystone.identity.core.RoleController`
 
 * Catalog
+
  * :mod:`keystone.catalog.core.ServiceController`
  * :mod:`keystone.service.VersionController`
 
 * Token
+
  * :mod:`keystone.service.TokenController`
 
 * Misc
+
  * :mod:`keystone.service.ExtensionsController`
 
 At this time, the policy service and associated manager is not exposed as a URL
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 073e598bc1..319faf0685 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -79,7 +79,7 @@ release = '2012.1-dev'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = []
+exclude_patterns = ['old']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst
index 653b3e663f..1c42253040 100644
--- a/doc/source/configuringservices.rst
+++ b/doc/source/configuringservices.rst
@@ -21,7 +21,7 @@ Configuring Services to work with Keystone
 .. toctree::
    :maxdepth: 1
 
-    middleware_architecture
+   middlewarearchitecture
 
 Once Keystone is installed and running (see :doc:`configuration`), services
 need to be configured to work with it. To do this, we primarily install and