Merge "[Docs] Move the upgrade reference into reference"

doc/source/reference/index.rst

@@ -1,17 +1,12 @@
-=========
-Inventory
-=========
+===========================
+OpenStack-Ansible Reference
+===========================
 
-OpenStack-Ansible uses an included script to generate the inventory of hosts
-and containers within the environment. This script is called by Ansible
-through its `dynamic inventory functionality <http://docs.ansible.com/ansible/intro_dynamic_inventory.html>`_.
-
-In this section, you will find documentation relevant to the inventory
-for OpenStack-Ansible.
+This chapter contains all the extra reference information
+to deploy, configure, or upgrade an OpenStack-Ansible cloud.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
-   generate-inventory
-   configure-inventory
-   manage-inventory
+   inventory/inventory.rst
+   upgrades/reference.rst

doc/source/reference/inventory/configure-inventory.rst

@@ -1,4 +1,3 @@
-=========================
 Configuring the inventory
 =========================
 

doc/source/reference/inventory/generate-inventory.rst

@@ -1,4 +1,3 @@
-========================
 Generating the Inventory
 ========================
 

doc/source/reference/inventory/inventory.rst

@@ -0,0 +1,17 @@
+=========
+Inventory
+=========
+
+OpenStack-Ansible uses an included script to generate the inventory of hosts
+and containers within the environment. This script is called by Ansible
+through its `dynamic inventory functionality <http://docs.ansible.com/ansible/intro_dynamic_inventory.html>`_.
+
+In this section, you will find documentation relevant to the inventory
+for OpenStack-Ansible.
+
+.. toctree::
+   :maxdepth: 2
+
+   generate-inventory
+   configure-inventory
+   manage-inventory

doc/source/reference/inventory/manage-inventory.rst

@@ -1,4 +1,3 @@
-=====================================
 Inspecting and managing the inventory
 =====================================
 

doc/source/reference/upgrades/reference-scripts.rst

@@ -1,6 +1,5 @@
-=======
-Scripts
-=======
+Major Upgrade Scripts
+=====================
 
 This section describes in detail the scripts that are used in the upgrade
 process.

doc/source/reference/upgrades/reference-upgrade-playbooks.rst

@@ -1,6 +1,5 @@
-=========
-Playbooks
-=========
+Major Upgrade Playbooks
+=======================
 
 This section provides details about the playbooks that are used in the
 upgrade process. Within the main :file:`scripts` directory there is an

doc/source/reference/upgrades/reference.rst

@@ -0,0 +1,7 @@
+========================
+Major upgrades reference
+========================
+
+
+.. include :: reference-scripts.rst
+.. include :: reference-upgrade-playbooks.rst

doc/source/user/reference.rst

@@ -1,9 +0,0 @@
-======================================
-Reference information for the upgrades
-======================================
-
-.. toctree::
-   :maxdepth: 2
-
-   reference-scripts
-   reference-upgrade-playbooks