From fdf7a5b66d6f39eb1384f8efe519f17510f1ce69 Mon Sep 17 00:00:00 2001 From: Suramya Shah Date: Fri, 23 Feb 2018 00:04:26 +0530 Subject: [PATCH] Consolidate Keystone docs: federated-identity.rst Consolidate advanced-topics/federation into the admin guide. Change-Id: I35c3d261ecf7c042c30c1272d4af85a0916515e2 --- .../federation/configure_federation.rst | 0 .../federation/federated_identity.rst | 0 .../federation/mapping_combinations.rst | 0 doc/source/{advanced-topics => admin}/federation/mellon.rst | 0 doc/source/{advanced-topics => admin}/federation/openidc.rst | 0 .../{advanced-topics => admin}/federation/shibboleth.rst | 0 doc/source/{advanced-topics => admin}/federation/websso.rst | 0 doc/source/admin/index.rst | 5 +++++ doc/source/advanced-topics/index.rst | 5 ----- 9 files changed, 5 insertions(+), 5 deletions(-) rename doc/source/{advanced-topics => admin}/federation/configure_federation.rst (100%) rename doc/source/{advanced-topics => admin}/federation/federated_identity.rst (100%) rename doc/source/{advanced-topics => admin}/federation/mapping_combinations.rst (100%) rename doc/source/{advanced-topics => admin}/federation/mellon.rst (100%) rename doc/source/{advanced-topics => admin}/federation/openidc.rst (100%) rename doc/source/{advanced-topics => admin}/federation/shibboleth.rst (100%) rename doc/source/{advanced-topics => admin}/federation/websso.rst (100%) diff --git a/doc/source/advanced-topics/federation/configure_federation.rst b/doc/source/admin/federation/configure_federation.rst similarity index 100% rename from doc/source/advanced-topics/federation/configure_federation.rst rename to doc/source/admin/federation/configure_federation.rst diff --git a/doc/source/advanced-topics/federation/federated_identity.rst b/doc/source/admin/federation/federated_identity.rst similarity index 100% rename from doc/source/advanced-topics/federation/federated_identity.rst rename to doc/source/admin/federation/federated_identity.rst diff --git a/doc/source/advanced-topics/federation/mapping_combinations.rst b/doc/source/admin/federation/mapping_combinations.rst similarity index 100% rename from doc/source/advanced-topics/federation/mapping_combinations.rst rename to doc/source/admin/federation/mapping_combinations.rst diff --git a/doc/source/advanced-topics/federation/mellon.rst b/doc/source/admin/federation/mellon.rst similarity index 100% rename from doc/source/advanced-topics/federation/mellon.rst rename to doc/source/admin/federation/mellon.rst diff --git a/doc/source/advanced-topics/federation/openidc.rst b/doc/source/admin/federation/openidc.rst similarity index 100% rename from doc/source/advanced-topics/federation/openidc.rst rename to doc/source/admin/federation/openidc.rst diff --git a/doc/source/advanced-topics/federation/shibboleth.rst b/doc/source/admin/federation/shibboleth.rst similarity index 100% rename from doc/source/advanced-topics/federation/shibboleth.rst rename to doc/source/admin/federation/shibboleth.rst diff --git a/doc/source/advanced-topics/federation/websso.rst b/doc/source/admin/federation/websso.rst similarity index 100% rename from doc/source/advanced-topics/federation/websso.rst rename to doc/source/admin/federation/websso.rst diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index 1eaf71d8b8..ae342932f1 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -45,3 +45,8 @@ command-line client. endpoint-policy.rst event_notifications.rst auth-totp.rst + +.. toctree:: + :maxdepth: 2 + + federation/federated_identity.rst diff --git a/doc/source/advanced-topics/index.rst b/doc/source/advanced-topics/index.rst index 6ae401a8cf..07bf66a742 100644 --- a/doc/source/advanced-topics/index.rst +++ b/doc/source/advanced-topics/index.rst @@ -2,11 +2,6 @@ Advanced Topics =============== -.. toctree:: - :maxdepth: 2 - - federation/federated_identity.rst - .. toctree:: :maxdepth: 1