From a01eb951515a35c47522b8e0c046a060b912f436 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Sun, 29 May 2016 21:56:19 +0900
Subject: [PATCH] [www] reorganize contributor guides

* Move TC docs up
* Move Tempest docs to Developer docs
* Remove Infra user manual because of a kind of duplication

Change-Id: Ibfc0e9e027db83380c0057a07ea8627f25eefd64
---
 www/developer/openstack-projects.html | 3 +++
 www/templates/contributor_guides.tmpl | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/www/developer/openstack-projects.html b/www/developer/openstack-projects.html
index d29286d490..3f7f2ae118 100644
--- a/www/developer/openstack-projects.html
+++ b/www/developer/openstack-projects.html
@@ -152,6 +152,9 @@
        <a href="http://docs.openstack.org/developer/reno/">
          Release Notes Manager (reno)
        </a>
+       <a href="http://docs.openstack.org/developer/tempest/">
+         Tempest Test Suite for OpenStack
+       </a>
     </div>
 
     <div class="docs-link-sections">
diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index 2cb2339de9..7980e840fa 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -2,6 +2,8 @@
                         <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
                         <a href="http://docs.openstack.org/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
                         <p>Documentation workflow and conventions</p>
+                        <a href="http://governance.openstack.org">OpenStack Technical Committee Governance Documents</a>
+                        <p>OpenStack Technical Committee reference documents and official resolutions</p>
                         <a href="/developer/openstack-projects.html">Python Developer Documentation</a>
                         <p>Documentation for OpenStack developers</p>
                         <a href="/developer/language-bindings.html">Language Bindings and Python Clients</a>
@@ -12,14 +14,8 @@
                         <p>Guide to the OpenStack project and community</p>
                         <a href="/infra/">OpenStack Developer and Community Infrastructure Documentation</a>
                         <p>Development and infrastructure documentation</p>
-                        <a href="/infra/manual/">OpenStack Infrastructure User Manual</a>
-                        <p>Guide to OpenStack software development infrastructure</p>
                         <a href="/developer/i18n/">OpenStack I18n Guide</a>
                         <p>Internationalization workflow and conventions</p>
-                        <a href="/developer/tempest">Tempest Test Suite for OpenStack</a>
-                        <p>Documentation for the Tempest test project</p>
-                        <a href="http://governance.openstack.org">OpenStack Technical Committee Governance Documents</a>
-                        <p>OpenStack Technical Committee reference documents and official resolutions</p>
                         <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
                         <p>How to join the OpenStack Foundation</p>
                         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>