From 452a0717d1b58a96816eb89fe7743f2e07a9dd17 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 21 Dec 2018 15:53:55 +0200
Subject: [PATCH] Tidy up tripleo docs merge contributor & developer guides

This merges the developer guide and contributor guide in index

Change-Id: I8743c5930aa46cde2735943b87e047e25ff169af
Related-Bug: #1804642
---
 doc/source/developer/index.rst                     |  1 +
 doc/source/index.rst                               | 13 ++-----------
 doc/source/upgrade/developer/upgrades/upgrades.rst |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/doc/source/developer/index.rst b/doc/source/developer/index.rst
index b80479af..9687d825 100644
--- a/doc/source/developer/index.rst
+++ b/doc/source/developer/index.rst
@@ -9,3 +9,4 @@ Documentation of developer-specific options in |project|.
    tht_walkthrough/tht_walkthrough
    release
    mistral_workflows/00-index
+   ../upgrade/developer/upgrades/upgrades
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f9b91f2a..dfef76de 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,8 +4,7 @@ Welcome to |project| documentation
 TripleO is a project aimed at installing, upgrading and operating OpenStack
 clouds using OpenStack's own cloud facilities as the foundation - building on
 Nova, Ironic, Neutron and Heat to automate cloud management at datacenter
-scale.
-
+scale
 
 Contributor Guide
 -----------------
@@ -15,6 +14,7 @@ Contributor Guide
   :includehidden:
 
   contributor/index
+  developer/index
 
 Install Guide
 -------------
@@ -34,15 +34,6 @@ Upgrades/Updates/FFWD-Upgrade
 
   upgrade/index
 
-Developer Guide
----------------
-
-.. toctree::
-  :maxdepth: 3
-  :includehidden:
-
-  developer/index
-
 Documentation Conventions
 =========================
 
diff --git a/doc/source/upgrade/developer/upgrades/upgrades.rst b/doc/source/upgrade/developer/upgrades/upgrades.rst
index ae6f3044..de8be9d7 100644
--- a/doc/source/upgrade/developer/upgrades/upgrades.rst
+++ b/doc/source/upgrade/developer/upgrades/upgrades.rst
@@ -1,5 +1,5 @@
-Developer Docs
-==============
+Upgrades Development
+====================
 
 This section is intended to give a better understanding of the upgrade/update
 process in TripleO. As well as a walkthrough for developers on the way upgrade