Consolidate admin guide and configuration guide

Both admin guide and configuration guide are targeting for the
same group of readers. There is no need to separate these two guides.
Move all contents under doc/source/admin to doc/source/configuration

Change-Id: I7560a8a52c2c4a23758dda75ae2979a68dd7c060
This commit is contained in:
Hongbin Lu 2018-03-24 17:44:50 +00:00
parent 620f1b43ac
commit a869abf951
7 changed files with 2 additions and 30 deletions

View File

@ -1,7 +0,0 @@
===============================================
Zun Administration Documentation (source/admin)
===============================================
This directory is intended to hold any documentation that is related
to how to run or operate Zun.

View File

@ -1,15 +0,0 @@
Administrator's Guide
=====================
Installation & Operations
-------------------------
If you are a system administrator running Zun, this section contains
information that should help you understand how to deploy, operate, and upgrade
the services.
.. toctree::
:maxdepth: 1
osprofiler
clear-containers

View File

@ -6,3 +6,5 @@ Sample Configuration File
sample-config
policy
osprofiler
clear-containers

View File

@ -92,7 +92,6 @@ as is documented in the ``README`` in each directory:
.. toctree::
:maxdepth: 1
../admin/README
../cli/README
../configuration/README
../contributor/README

View File

@ -17,13 +17,6 @@ Welcome to Zun's documentation!
Zun is an OpenStack Container service. It aims to provide an OpenStack API for
provisioning and managing containerized workload on OpenStack.
Admin Guide
~~~~~~~~~~~
.. toctree::
:maxdepth: 1
admin/index
Contributor Guide
~~~~~~~~~~~~~~~~~
.. toctree::