From bb21ca2b5a351010cb757ed6a1956fa39bc58015 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Fri, 7 Jul 2017 14:01:16 +0800
Subject: [PATCH] Adapt solum documentation for new standards

This patch set makes the following changes:
 * using the new standards
 * Update doc/source/index.rst with new links

Change-Id: If350cc2a7c5b8a6b8ae01d74ef3f992dc2c5c361
---
 .../{develop_applications => admin}/index.rst       |   0
 .../webapi/index.rst                                |   0
 .../{develop_applications => admin}/webapi/v1.rst   |   0
 .../webapi/version.rst                              |   0
 .../{configure_and_run => configuration}/index.rst  |   0
 .../solum_architecture.gliffy                       |   0
 .../solum_architecture.png                          | Bin
 doc/source/{contribute => contributor}/index.rst    |   0
 doc/source/index.rst                                |  10 +++++-----
 doc/source/readme.rst                               |   1 -
 doc/source/{getting_started => user}/index.rst      |   0
 11 files changed, 5 insertions(+), 6 deletions(-)
 rename doc/source/{develop_applications => admin}/index.rst (100%)
 rename doc/source/{develop_applications => admin}/webapi/index.rst (100%)
 rename doc/source/{develop_applications => admin}/webapi/v1.rst (100%)
 rename doc/source/{develop_applications => admin}/webapi/version.rst (100%)
 rename doc/source/{configure_and_run => configuration}/index.rst (100%)
 rename doc/source/{configure_and_run => configuration}/solum_architecture.gliffy (100%)
 rename doc/source/{configure_and_run => configuration}/solum_architecture.png (100%)
 rename doc/source/{contribute => contributor}/index.rst (100%)
 delete mode 100644 doc/source/readme.rst
 rename doc/source/{getting_started => user}/index.rst (100%)

diff --git a/doc/source/develop_applications/index.rst b/doc/source/admin/index.rst
similarity index 100%
rename from doc/source/develop_applications/index.rst
rename to doc/source/admin/index.rst
diff --git a/doc/source/develop_applications/webapi/index.rst b/doc/source/admin/webapi/index.rst
similarity index 100%
rename from doc/source/develop_applications/webapi/index.rst
rename to doc/source/admin/webapi/index.rst
diff --git a/doc/source/develop_applications/webapi/v1.rst b/doc/source/admin/webapi/v1.rst
similarity index 100%
rename from doc/source/develop_applications/webapi/v1.rst
rename to doc/source/admin/webapi/v1.rst
diff --git a/doc/source/develop_applications/webapi/version.rst b/doc/source/admin/webapi/version.rst
similarity index 100%
rename from doc/source/develop_applications/webapi/version.rst
rename to doc/source/admin/webapi/version.rst
diff --git a/doc/source/configure_and_run/index.rst b/doc/source/configuration/index.rst
similarity index 100%
rename from doc/source/configure_and_run/index.rst
rename to doc/source/configuration/index.rst
diff --git a/doc/source/configure_and_run/solum_architecture.gliffy b/doc/source/configuration/solum_architecture.gliffy
similarity index 100%
rename from doc/source/configure_and_run/solum_architecture.gliffy
rename to doc/source/configuration/solum_architecture.gliffy
diff --git a/doc/source/configure_and_run/solum_architecture.png b/doc/source/configuration/solum_architecture.png
similarity index 100%
rename from doc/source/configure_and_run/solum_architecture.png
rename to doc/source/configuration/solum_architecture.png
diff --git a/doc/source/contribute/index.rst b/doc/source/contributor/index.rst
similarity index 100%
rename from doc/source/contribute/index.rst
rename to doc/source/contributor/index.rst
diff --git a/doc/source/index.rst b/doc/source/index.rst
index eb2438642..354dcc2cd 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -7,12 +7,12 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   readme
-   getting_started/index
+   user/index
    install/index
-   configure_and_run/index
-   develop_applications/index
-   contribute/index
+   configuration/index
+   admin/index
+   contributor/index
+   man/index
 
 Indices and tables
 ==================
diff --git a/doc/source/readme.rst b/doc/source/readme.rst
deleted file mode 100644
index a6210d3d8..000000000
--- a/doc/source/readme.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../README.rst
diff --git a/doc/source/getting_started/index.rst b/doc/source/user/index.rst
similarity index 100%
rename from doc/source/getting_started/index.rst
rename to doc/source/user/index.rst