Merge "Rearrange existing documentation to fit the new standard layout"

doc/source/admin/index.rst

@@ -0,0 +1,18 @@
+===================
+Administrator Guide
+===================
+
+Building Container Images
+-------------------------
+
+If you are a system administrator running Kolla, this section contains
+information that should help you understand how to build container image
+or build some images using ``--template-override``.
+
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   image-building
+   template-override/*

doc/source/contributor/index.rst

@@ -0,0 +1,17 @@
+============
+Development
+============
+
+Contributing
+------------
+
+This guide is to tell someone who would like to contribute to
+Kolla project. Following this guide to propose your first patch for Kolla.
+And we are welcome everyone to join our project!
+
+.. toctree::
+   :maxdepth: 2
+
+   CONTRIBUTING.rst
+   running-tests
+   bug-triage

doc/source/index.rst

@@ -37,30 +37,18 @@ example:
 
     https://docs.openstack.org/kolla/mitaka/
 
-
-Kolla Overview
-==============
+Administrator Guide
+===================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   image-building
+   admin/index
 
-Developer Docs
-==============
+Contributor Guide
+=================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   CONTRIBUTING
-   running-tests
-   bug-triage
-
-Template Override Docs
-======================
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-
-   template-override/*
+   contributor/index

setup.cfg

@@ -46,7 +46,7 @@ setup-hooks =
 [build_sphinx]
 all_files = 1
 build-dir = doc/build
-source-dir = doc
+source-dir = doc/source
 warning-is-error = 1
 
 [build_releasenotes]