Merge "[doc-migration] Add admin folder for related documents"

This commit is contained in:
Jenkins 2017-07-25 09:28:04 +00:00 committed by Gerrit Code Review
commit 98d582d358
10 changed files with 33 additions and 10 deletions

View File

@ -0,0 +1,27 @@
Adminstrator's Guide
====================
Installation & Operations
-------------------------
If you are a system administrator running Magnum, this section contains
information that should help you understand how to deploy, operate, and upgrade
the services.
.. toctree::
:maxdepth: 1
Magnum Proxy <magnum-proxy>
gmr
Troubleshooting FAQ <troubleshooting-guide>
Configuration
-------------
Following pages will be helpful in configuring specific aspects
of Magnum that may or may not be suitable to every situation.
.. toctree::
:maxdepth: 1
configuring

View File

@ -12,7 +12,6 @@ with pointers to the details for troubleshooting.
A separate section `for developers`_ describes useful techniques such as A separate section `for developers`_ describes useful techniques such as
debugging unit tests and gate tests. debugging unit tests and gate tests.
================
Failure symptoms Failure symptoms
================ ================
@ -70,7 +69,6 @@ My cluster-create fails with a resource error on docker_volume
Run "nova volume-list" to check the volume status. Run "nova volume-list" to check the volume status.
=======================
Troubleshooting details Troubleshooting details
======================= =======================
@ -681,7 +679,6 @@ Heat software resource scripts
*To be filled in* *To be filled in*
==============
For Developers For Developers
============== ==============

View File

@ -1 +0,0 @@
.. include:: ../../magnum/api/rest_api_version_history.rst

View File

@ -0,0 +1 @@
.. include:: ../../../magnum/api/rest_api_version_history.rst

View File

@ -24,3 +24,5 @@ contribute effectively towards code standards to the project.
Writing a Release Note <reno> Writing a Release Note <reno>
Adding a New API Method <api-microversion> Adding a New API Method <api-microversion>
Changing Magnum DB Objects <objects> Changing Magnum DB Objects <objects>
api-microversion-history
policies

View File

@ -58,10 +58,8 @@ User Documentation
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
policies.rst
dev/cluster-type-definition.rst dev/cluster-type-definition.rst
dev/kubernetes-load-balancer.rst dev/kubernetes-load-balancer.rst
api_microversion_history.rst
heat-templates heat-templates
@ -77,8 +75,7 @@ Admin Guide
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
gmr.rst admin/index
magnum-proxy.rst
Work In Progress Work In Progress
================ ================
@ -86,7 +83,7 @@ Work In Progress
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
troubleshooting-guide.rst admin/troubleshooting-guide.rst
userguide.rst userguide.rst
configuring.rst admin/configuring.rst
install-guide-from-source.rst install-guide-from-source.rst