diff --git a/doc/source/admin/federation/configure_federation.rst b/doc/source/admin/federation/configure_federation.rst
index 7d3d3daeb4..3055720818 100644
--- a/doc/source/admin/federation/configure_federation.rst
+++ b/doc/source/admin/federation/configure_federation.rst
@@ -538,3 +538,9 @@ scoped token from the SP.
     --os-remote-project-name federated_project \
     --os-remote-project-domain-name federated_domain \
     token issue
+
+
+.. include:: openidc.rst
+.. include:: mellon.rst
+.. include:: shibboleth.rst
+.. include:: websso.rst
diff --git a/doc/source/admin/federation/federated_identity.rst b/doc/source/admin/federation/federated_identity.rst
index ef64a7841e..df109e7240 100644
--- a/doc/source/admin/federation/federated_identity.rst
+++ b/doc/source/admin/federation/federated_identity.rst
@@ -2,12 +2,9 @@
 Federated Identity
 ==================
 
-Keystone's one-stop-shop for all federated identity documentation.
+.. toctree::
+    :maxdepth: 2
 
-.. include:: introduction.rst
-.. include:: configure_federation.rst
-.. include:: mapping_combinations.rst
-.. include:: openidc.rst
-.. include:: mellon.rst
-.. include:: shibboleth.rst
-.. include:: websso.rst
+    introduction.rst
+    configure_federation.rst
+    mapping_combinations.rst
diff --git a/doc/source/admin/federation/mellon.rst b/doc/source/admin/federation/mellon.rst
index dca60fd642..bf60f465bc 100644
--- a/doc/source/admin/federation/mellon.rst
+++ b/doc/source/admin/federation/mellon.rst
@@ -11,10 +11,10 @@
       License for the specific language governing permissions and limitations
       under the License.
 
+------------
 Setup Mellon
-============
+------------
 
-------------------------------------------
 Configure Apache HTTPD for mod_auth_mellon
 ------------------------------------------
 
@@ -73,7 +73,6 @@ Enable the ``auth_mellon`` module, for example:
 
     $ a2enmod auth_mellon
 
-----------------------------------
 Configuring the Mellon SP Metadata
 ----------------------------------
 
diff --git a/doc/source/admin/federation/openidc.rst b/doc/source/admin/federation/openidc.rst
index 0db329cc30..32ea749da7 100644
--- a/doc/source/admin/federation/openidc.rst
+++ b/doc/source/admin/federation/openidc.rst
@@ -11,10 +11,10 @@
       License for the specific language governing permissions and limitations
       under the License.
 
+--------------------
 Setup OpenID Connect
-====================
+--------------------
 
-----------------------------
 Configuring mod_auth_openidc
 ----------------------------
 
@@ -79,7 +79,6 @@ Once you are done, restart your Apache daemon:
 
     $ sudo service apache2 restart
 
-----
 Tips
 ----
 
diff --git a/doc/source/admin/federation/shibboleth.rst b/doc/source/admin/federation/shibboleth.rst
index 570fd74d4c..45c6bdb520 100644
--- a/doc/source/admin/federation/shibboleth.rst
+++ b/doc/source/admin/federation/shibboleth.rst
@@ -11,10 +11,10 @@
       License for the specific language governing permissions and limitations
       under the License.
 
+----------------
 Setup Shibboleth
-================
+----------------
 
------------------------------------------
 Configure Apache HTTPD for mod_shibboleth
 -----------------------------------------
 
@@ -78,7 +78,6 @@ Restart Apache, for example:
 
     $ service apache2 restart
 
----------------------------
 Configuring shibboleth2.xml
 ---------------------------
 
diff --git a/doc/source/admin/federation/websso.rst b/doc/source/admin/federation/websso.rst
index c8bac055c6..077635a9e6 100644
--- a/doc/source/admin/federation/websso.rst
+++ b/doc/source/admin/federation/websso.rst
@@ -11,10 +11,10 @@
       License for the specific language governing permissions and limitations
       under the License.
 
+------------------------------
 Setup Web Single Sign-On (SSO)
-==============================
+------------------------------
 
-----------------
 Keystone Changes
 ----------------
 
@@ -171,7 +171,6 @@ Alternatively, a generic option may be set at the `[federation]` level.
 <https://git.openstack.org/cgit/openstack/keystone/plain/etc/sso_callback_template.html>`__
 template into the location specified by `[federation]/sso_callback_template`.
 
----------------
 Horizon Changes
 ---------------