Merge "Add configuration guide"

2017-07-28 23:01:12 +00:00
parent 84e50d1442 e0b595274c
commit 4e138e23b7
8 changed files with 13 additions and 2 deletions
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -10,7 +10,6 @@ Deploying Murano

   deploy_murano
   prepare_lab
-   configuration
   murano_policies
   manage_packages
   manage_images
@@ -18,7 +17,6 @@ Deploying Murano
   murano_repository
   murano_agent
   policy_enf
-   configure_cloud_foundry_service_broker
   using_glare.rst
   admin_troubleshooting
   appdev-guide/developer_index
--- a/doc/source/configuration/configuration.rst
+++ b/doc/source/configuration/configuration.rst
--- a/doc/source/configuration/configure_cloud_foundry_service_broker.rst
+++ b/doc/source/configuration/configure_cloud_foundry_service_broker.rst
--- a/doc/source/configuration/figures/add-interface.png
+++ b/doc/source/configuration/figures/add-interface.png
--- a/doc/source/configuration/figures/network-topology-1.png
+++ b/doc/source/configuration/figures/network-topology-1.png
--- a/doc/source/configuration/figures/network-topology-2.png
+++ b/doc/source/configuration/figures/network-topology-2.png
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -0,0 +1,5 @@
+.. toctree::
+   :maxdepth: 1
+
+   configuration
+   configure_cloud_foundry_service_broker
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -59,6 +59,14 @@ Installation

  install/index

+Configuration
+~~~~~~~~~~~~~
+
+.. toctree::
+  :maxdepth: 2
+
+  configuration/index
+
 Administrator Documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~