diff --git a/doc/source/index.rst b/doc/source/index.rst
index b784d026..97ca5f73 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -47,6 +47,13 @@ using `Gerrit`_.
 Run tests with ``tox -e py27`` if running with python 2.7. See the
 ``tox.ini`` file for other test environment options.
 
+Code Documentation
+==================
+.. toctree::
+   :maxdepth: 1
+
+   api/modules
+
 Indices and tables
 ==================
 
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index 7c522e1d..33e57916 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -307,13 +307,11 @@ class BaseAuthProtocol(object):
                                    perform.
     """
 
-    # NOTE(jamielennox): Default to True and remove in Pike.
+    # NOTE(jamielennox): Default to True and remove in Pike. This is a
+    # compatibility flag to allow passing **kwargs to fetch_token(). This
+    # is basically to allow compatibility with keystone's override. We will
+    # assume all subclasses are ok with this being True in the Pike release.
     kwargs_to_fetch_token = False
-    """A compatibility flag to allow passing **kwargs to fetch_token().
-
-    This is basically to allow compatibility with keystone's override. We will
-    assume all subclasses are ok with this being True in the Pike release.
-    """
 
     def __init__(self,
                  app,