From 85107272bec7117a4065e2cd4212b832e5bad607 Mon Sep 17 00:00:00 2001
From: Alexandra Settle <a.settle@outlook.com>
Date: Wed, 13 Sep 2017 13:56:23 -0600
Subject: [PATCH] [contrib-guide] Updating url to doc-contrib-guide

Based off conversation at the PTG, we agreed it would be
beneficial to ensure the contrib-guide is clearly marked
as the doc contrib guide outside of the title.

This change includes a redirect.

Change-Id: I5abf915f0b94a482afa961e6b86364c26aae5d79
---
 CONTRIBUTING.rst                              |   2 +-
 README.rst                                    |   4 +-
 doc-tools-check-languages.conf                |   2 +-
 doc/common/app-support.rst                    |   4 +-
 .../setup.cfg                                 |   0
 .../setup.py                                  |   0
 .../source/additional-git-workflow.rst        |   0
 .../source/additional-git-workflow/rebase.rst |   0
 .../source/api-guides.rst                     |   0
 .../source/blueprints-and-specs.rst           |   4 +-
 .../source/common                             |   0
 .../source/conf.py                            |   6 +-
 .../source/diagram-guidelines.rst             |   0
 .../diagram-guidelines/diagram-usage.rst      |   0
 .../source/diagram-guidelines/files.rst       |   0
 .../diagram-guidelines/general-guidelines.rst |   0
 .../source/diagram-guidelines/tools.rst       |   0
 .../source/doc-bugs.rst                       |   0
 .../source/doc-impact.rst                     |   0
 .../source/doc-index.rst                      |   0
 .../source/doc-tag.rst                        |   0
 .../source/doc-tools.rst                      |   0
 .../source/doc-tools/cli-reference.rst        |   0
 .../source/doc-tools/config-reference.rst     |   0
 .../source/doc-tools/contributing.rst         |   0
 .../source/doc-tools/installation.rst         |   0
 .../source/doc-tools/scripts.rst              |   0
 .../source/doc-tools/template-generator.rst   |   0
 .../source/docs-builds.rst                    |   4 +-
 .../source/docs-review-guidelines.rst         |   0
 .../source/docs-review.rst                    |   0
 .../source/figures/doc-logo-fox.jpg           | Bin
 .../source/figures/workflow-diagram.png       | Bin
 .../source/index.rst                          |   0
 .../source/json-conv.rst                      |   0
 .../source/landing-pages.rst                  |   0
 .../source/non-native-english-speakers.rst    |   0
 .../source/project-deploy-guide.rst           |   0
 .../source/project-guides.rst                 |   0
 .../source/project-install-guide.rst          |   0
 .../source/quickstart.rst                     |   0
 .../source/quickstart/developers.rst          |   0
 .../source/quickstart/first-timers.rst        |   0
 .../source/quickstart/new-projects.rst        |   0
 .../source/release.rst                        |   0
 .../source/release/release-tools.rst          |   0
 .../source/release/taskdetail.rst             |   0
 .../source/release/taskoverview.rst           |   0
 .../source/rst-conv.rst                       |   0
 .../source/rst-conv/comment.rst               |   0
 .../source/rst-conv/decorations.rst           |   0
 .../source/rst-conv/figures.rst               |   0
 .../source/rst-conv/file-naming.rst           |   0
 .../source/rst-conv/general-guidelines.rst    |   0
 .../source/rst-conv/inline-markups.rst        |   0
 .../source/rst-conv/lists.rst                 |   0
 .../source/rst-conv/profiling.rst             |   0
 .../source/rst-conv/references.rst            |   0
 .../source/rst-conv/rst2bash.rst              |   0
 .../source/rst-conv/source-code.rst           |   0
 .../source/rst-conv/specific-info.rst         |   0
 .../source/rst-conv/tables.rst                |   0
 .../source/rst-conv/titles.rst                |   0
 .../source/team-structure.rst                 |   0
 .../source/topic-structure.rst                |   0
 .../source/topic-tags.rst                     |   0
 .../source/user-guidelines.rst                |   0
 .../ux-ui-guidelines/figures/gui-actions.png  | Bin
 .../ux-ui-guidelines/figures/gui-actions.svg  |   0
 .../figures/gui-cancelbutton.png              | Bin
 .../figures/gui-cancelbutton.svg              |   0
 .../ux-ui-guidelines/figures/gui-errors.png   | Bin
 .../ux-ui-guidelines/figures/gui-errors.svg   |   0
 .../figures/gui-modalerror.png                | Bin
 .../figures/gui-modalerror.svg                |   0
 .../ux-ui-guidelines/figures/gui-search.png   | Bin
 .../ux-ui-guidelines/figures/gui-search.svg   |   0
 .../ux-ui-guidelines/figures/gui-wizards.png  | Bin
 .../ux-ui-guidelines/figures/gui-wizards.svg  |   0
 .../figures/persona-ecosystem.png             | Bin
 .../figures/persona-ecosystem.svg             |   0
 .../figures/ui-text-cheatsheet.jpg            | Bin
 .../ux-ui-guidelines/gui-guidelines.rst       |   0
 .../ux-ui-guidelines/ui-text-guidelines.rst   |   0
 .../ui-text-guidelines/ui-action-labels.rst   |   0
 .../ui-text-guidelines/ui-error-messages.rst  |   0
 .../ui-panel-formatting.rst                   |   0
 .../ui-text-capitalization.rst                |   0
 .../source/ux-ui-guidelines/ux-personas.rst   |   0
 .../ux-personas/app-developer.rst             |   0
 .../ux-personas/cloud-ops.rst                 |   0
 .../ux-personas/domain-operator.rst           |   0
 .../ux-personas/infrastructure-arch.rst       |   0
 .../ux-personas/model-companies.rst           |   0
 .../ux-personas/project-owner.rst             |   0
 .../source/vendor-drivers.rst                 |   0
 .../source/writing-docs.rst                   |   0
 .../source/writing-style.rst                  |   0
 .../source/writing-style/code-conventions.rst |   0
 .../general-writing-guidelines.rst            |   2 +-
 .../source/writing-style/headings.rst         |   0
 .../source/writing-style/lists.rst            |   0
 .../num_and_units_of_measure.rst              |   0
 .../writing-style/openstack-components.rst    |   0
 .../source/writing-style/punctuation.rst      |   0
 .../source/writing-style/release-names.rst    |   0
 .../source/writing-style/ui-terminology.rst   |   0
 .../source/writing-style/urls.rst             |   0
 .../source/writing-style/word-choice.rst      |   0
 doc/glossary/source/conf.py                   |   2 +-
 releasenotes/source/newton.rst                |   2 +-
 tools/build-all-rst.sh                        |   2 +-
 www/.htaccess                                 |   9 +-
 www/de/index.html                             |   2 +-
 www/fr/index.html                             |   2 +-
 www/id/index.html                             |   2 +-
 www/ja/index.html                             |   2 +-
 www/ko_KR/index.html                          |   2 +-
 www/mitaka/api/index.html                     |   2 +-
 www/newton/api/index.html                     |   2 +-
 www/newton/deploy/index.html                  |   2 +-
 www/newton/install/index.html                 |   2 +-
 www/ocata/api/index.html                      |   2 +-
 www/ocata/deploy/index.html                   |   2 +-
 www/ocata/index.html                          |   4 +-
 www/ocata/install/index.html                  |   2 +-
 www/ocata/install/obs-services.html           |   2 +-
 www/ocata/install/rdo-services.html           |   2 +-
 www/ocata/install/ubuntu-services.html        |   2 +-
 www/ocata/language-bindings.html              |   2 +-
 www/ocata/projects.html                       |   2 +-
 www/pike/admin/index.html                     |   2 +-
 www/pike/api/index.html                       |   2 +-
 www/pike/configuration/index.html             |   2 +-
 www/pike/deploy/index.html                    |   2 +-
 www/pike/index.html                           |   4 +-
 www/pike/install/index.html                   |   2 +-
 www/pike/language-bindings.html               |   2 +-
 www/pike/projects.html                        |   2 +-
 www/pike/user/index.html                      |   2 +-
 www/project-data/README.rst                   |   2 +-
 www/queens/admin/index.html                   |   2 +-
 www/queens/api/index.html                     |   2 +-
 www/queens/configuration/index.html           |   2 +-
 www/queens/deploy/index.html                  |   2 +-
 www/queens/index.html                         |   4 +-
 www/queens/install/index.html                 |   2 +-
 www/queens/language-bindings.html             |   2 +-
 www/queens/projects.html                      |   2 +-
 www/queens/user/index.html                    |   2 +-
 www/redirect-tests.txt                        |  12 +-
 www/static/sitemap.xml                        | 214 +++++++++---------
 www/templates/contributor_guides.tmpl         |   4 +-
 www/templates/indexbase.tmpl                  |   2 +-
 154 files changed, 181 insertions(+), 174 deletions(-)
 rename doc/{contributor-guide => doc-contrib-guide}/setup.cfg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/setup.py (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/additional-git-workflow.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/additional-git-workflow/rebase.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/api-guides.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/blueprints-and-specs.rst (99%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/common (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/conf.py (98%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/diagram-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/diagram-guidelines/diagram-usage.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/diagram-guidelines/files.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/diagram-guidelines/general-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/diagram-guidelines/tools.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-bugs.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-impact.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-index.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tag.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/cli-reference.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/config-reference.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/contributing.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/installation.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/scripts.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/doc-tools/template-generator.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/docs-builds.rst (98%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/docs-review-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/docs-review.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/figures/doc-logo-fox.jpg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/figures/workflow-diagram.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/index.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/json-conv.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/landing-pages.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/non-native-english-speakers.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/project-deploy-guide.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/project-guides.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/project-install-guide.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/quickstart.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/quickstart/developers.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/quickstart/first-timers.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/quickstart/new-projects.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/release.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/release/release-tools.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/release/taskdetail.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/release/taskoverview.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/comment.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/decorations.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/figures.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/file-naming.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/general-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/inline-markups.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/lists.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/profiling.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/references.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/rst2bash.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/source-code.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/specific-info.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/tables.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/rst-conv/titles.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/team-structure.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/topic-structure.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/topic-tags.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/user-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-actions.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-actions.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-cancelbutton.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-cancelbutton.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-errors.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-errors.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-modalerror.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-modalerror.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-search.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-search.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-wizards.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/gui-wizards.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/persona-ecosystem.png (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/persona-ecosystem.svg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/figures/ui-text-cheatsheet.jpg (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/gui-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ui-text-guidelines.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/app-developer.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/cloud-ops.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/domain-operator.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/infrastructure-arch.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/model-companies.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/ux-ui-guidelines/ux-personas/project-owner.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/vendor-drivers.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-docs.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/code-conventions.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/general-writing-guidelines.rst (99%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/headings.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/lists.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/num_and_units_of_measure.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/openstack-components.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/punctuation.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/release-names.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/ui-terminology.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/urls.rst (100%)
 rename doc/{contributor-guide => doc-contrib-guide}/source/writing-style/word-choice.rst (100%)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0301ae34de..4dcd01fe4e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -16,7 +16,7 @@ documentation to testing to deployment scripts.
 
 If you would like to contribute to the documents, please see the
 `OpenStack Documentation Contributor Guide
-<https://docs.openstack.org/contributor-guide/>`_.
+<https://docs.openstack.org/doc-contrib-guide/>`_.
 
 If you would like to contribute to the development of OpenStack, you must
 follow the steps in this page:
diff --git a/README.rst b/README.rst
index 7707f9787b..6831724af8 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,7 @@ OpenStack Manuals
 This repository contains documentation for the OpenStack project.
 
 For more details, see the `OpenStack Documentation Contributor
-Guide <https://docs.openstack.org/contributor-guide/>`_.
+Guide <https://docs.openstack.org/doc-contrib-guide/>`_.
 
 It includes these manuals:
 
@@ -97,7 +97,7 @@ Generated files
 Some documentation files are generated using tools. These files include
 a ``do not edit`` header and should not be modified by hand.
 Please see `Generated files
-<https://docs.openstack.org/contributor-guide/doc-tools.html>`_.
+<https://docs.openstack.org/doc-contrib-guide/doc-tools.html>`_.
 
 
 Bugs
diff --git a/doc-tools-check-languages.conf b/doc-tools-check-languages.conf
index d586feadfb..97c74b5183 100644
--- a/doc-tools-check-languages.conf
+++ b/doc-tools-check-languages.conf
@@ -29,7 +29,7 @@ declare -A SPECIAL_BOOKS=(
     ["install-guide"]="RST"
     # Do not translate
     ["arch-design"]="skip"
-    ["contributor-guide"]="skip"
+    ["doc-contrib-guide"]="skip"
     ["releasenotes"]="skip"
     ["ha-guide-draft"]="skip"
 )
diff --git a/doc/common/app-support.rst b/doc/common/app-support.rst
index a7c27a5d41..070e6ddbdf 100644
--- a/doc/common/app-support.rst
+++ b/doc/common/app-support.rst
@@ -62,7 +62,7 @@ for the OpenStack APIs:
 
 The following guide provides how to contribute to OpenStack documentation:
 
-*  `Documentation Contributor Guide <https://docs.openstack.org/contributor-guide/>`_
+*  `Documentation Contributor Guide <https://docs.openstack.org/doc-contrib-guide/>`_
 
 ask.openstack.org
 ~~~~~~~~~~~~~~~~~
@@ -102,7 +102,7 @@ of relevant material. More is being added all the time, so be sure to
 check back often. You can find the search box in the upper-right corner
 of any OpenStack wiki page.
 
-The Launchpad Bugs area
+The Launchpad bugs area
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 The OpenStack community values your set up and testing efforts and wants
diff --git a/doc/contributor-guide/setup.cfg b/doc/doc-contrib-guide/setup.cfg
similarity index 100%
rename from doc/contributor-guide/setup.cfg
rename to doc/doc-contrib-guide/setup.cfg
diff --git a/doc/contributor-guide/setup.py b/doc/doc-contrib-guide/setup.py
similarity index 100%
rename from doc/contributor-guide/setup.py
rename to doc/doc-contrib-guide/setup.py
diff --git a/doc/contributor-guide/source/additional-git-workflow.rst b/doc/doc-contrib-guide/source/additional-git-workflow.rst
similarity index 100%
rename from doc/contributor-guide/source/additional-git-workflow.rst
rename to doc/doc-contrib-guide/source/additional-git-workflow.rst
diff --git a/doc/contributor-guide/source/additional-git-workflow/rebase.rst b/doc/doc-contrib-guide/source/additional-git-workflow/rebase.rst
similarity index 100%
rename from doc/contributor-guide/source/additional-git-workflow/rebase.rst
rename to doc/doc-contrib-guide/source/additional-git-workflow/rebase.rst
diff --git a/doc/contributor-guide/source/api-guides.rst b/doc/doc-contrib-guide/source/api-guides.rst
similarity index 100%
rename from doc/contributor-guide/source/api-guides.rst
rename to doc/doc-contrib-guide/source/api-guides.rst
diff --git a/doc/contributor-guide/source/blueprints-and-specs.rst b/doc/doc-contrib-guide/source/blueprints-and-specs.rst
similarity index 99%
rename from doc/contributor-guide/source/blueprints-and-specs.rst
rename to doc/doc-contrib-guide/source/blueprints-and-specs.rst
index e27e3cf155..f8c2ab94a2 100644
--- a/doc/contributor-guide/source/blueprints-and-specs.rst
+++ b/doc/doc-contrib-guide/source/blueprints-and-specs.rst
@@ -264,8 +264,8 @@ and the `built documentation <https://docs.openstack.org/horizon/>`_.
      - Target location
 
    * - Documentation Contributor Guide
-     - https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/contributor-guide
-     - https://docs.openstack.org/contributor-guide/
+     - https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/doc-contrib-guide
+     - https://docs.openstack.org/doc-contrib-guide/
 
    * - Python Developer Documentation
      - https://git.openstack.org/cgit/openstack/<project>/tree/master/doc/source/,
diff --git a/doc/contributor-guide/source/common b/doc/doc-contrib-guide/source/common
similarity index 100%
rename from doc/contributor-guide/source/common
rename to doc/doc-contrib-guide/source/common
diff --git a/doc/contributor-guide/source/conf.py b/doc/doc-contrib-guide/source/conf.py
similarity index 98%
rename from doc/contributor-guide/source/conf.py
rename to doc/doc-contrib-guide/source/conf.py
index c60bca2318..21ff8d1470 100644
--- a/doc/contributor-guide/source/conf.py
+++ b/doc/doc-contrib-guide/source/conf.py
@@ -55,8 +55,8 @@ master_doc = 'index'
 # General information about the project.
 repository_name = "openstack/openstack-manuals"
 bug_project = 'openstack-manuals'
-project = u'Contributor Guide'
-bug_tag = u'contributor-guide'
+project = u'Documentation Contributor Guide'
+bug_tag = u'doc-contrib-guide'
 
 copyright = u'2015-2017, OpenStack contributors'
 
@@ -200,7 +200,7 @@ html_show_sourcelink = False
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'contributor-guide'
+htmlhelp_basename = 'doc-contrib-guide'
 
 # If true, publish source files
 html_copy_source = False
diff --git a/doc/contributor-guide/source/diagram-guidelines.rst b/doc/doc-contrib-guide/source/diagram-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/diagram-guidelines.rst
rename to doc/doc-contrib-guide/source/diagram-guidelines.rst
diff --git a/doc/contributor-guide/source/diagram-guidelines/diagram-usage.rst b/doc/doc-contrib-guide/source/diagram-guidelines/diagram-usage.rst
similarity index 100%
rename from doc/contributor-guide/source/diagram-guidelines/diagram-usage.rst
rename to doc/doc-contrib-guide/source/diagram-guidelines/diagram-usage.rst
diff --git a/doc/contributor-guide/source/diagram-guidelines/files.rst b/doc/doc-contrib-guide/source/diagram-guidelines/files.rst
similarity index 100%
rename from doc/contributor-guide/source/diagram-guidelines/files.rst
rename to doc/doc-contrib-guide/source/diagram-guidelines/files.rst
diff --git a/doc/contributor-guide/source/diagram-guidelines/general-guidelines.rst b/doc/doc-contrib-guide/source/diagram-guidelines/general-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/diagram-guidelines/general-guidelines.rst
rename to doc/doc-contrib-guide/source/diagram-guidelines/general-guidelines.rst
diff --git a/doc/contributor-guide/source/diagram-guidelines/tools.rst b/doc/doc-contrib-guide/source/diagram-guidelines/tools.rst
similarity index 100%
rename from doc/contributor-guide/source/diagram-guidelines/tools.rst
rename to doc/doc-contrib-guide/source/diagram-guidelines/tools.rst
diff --git a/doc/contributor-guide/source/doc-bugs.rst b/doc/doc-contrib-guide/source/doc-bugs.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-bugs.rst
rename to doc/doc-contrib-guide/source/doc-bugs.rst
diff --git a/doc/contributor-guide/source/doc-impact.rst b/doc/doc-contrib-guide/source/doc-impact.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-impact.rst
rename to doc/doc-contrib-guide/source/doc-impact.rst
diff --git a/doc/contributor-guide/source/doc-index.rst b/doc/doc-contrib-guide/source/doc-index.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-index.rst
rename to doc/doc-contrib-guide/source/doc-index.rst
diff --git a/doc/contributor-guide/source/doc-tag.rst b/doc/doc-contrib-guide/source/doc-tag.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tag.rst
rename to doc/doc-contrib-guide/source/doc-tag.rst
diff --git a/doc/contributor-guide/source/doc-tools.rst b/doc/doc-contrib-guide/source/doc-tools.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools.rst
rename to doc/doc-contrib-guide/source/doc-tools.rst
diff --git a/doc/contributor-guide/source/doc-tools/cli-reference.rst b/doc/doc-contrib-guide/source/doc-tools/cli-reference.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/cli-reference.rst
rename to doc/doc-contrib-guide/source/doc-tools/cli-reference.rst
diff --git a/doc/contributor-guide/source/doc-tools/config-reference.rst b/doc/doc-contrib-guide/source/doc-tools/config-reference.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/config-reference.rst
rename to doc/doc-contrib-guide/source/doc-tools/config-reference.rst
diff --git a/doc/contributor-guide/source/doc-tools/contributing.rst b/doc/doc-contrib-guide/source/doc-tools/contributing.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/contributing.rst
rename to doc/doc-contrib-guide/source/doc-tools/contributing.rst
diff --git a/doc/contributor-guide/source/doc-tools/installation.rst b/doc/doc-contrib-guide/source/doc-tools/installation.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/installation.rst
rename to doc/doc-contrib-guide/source/doc-tools/installation.rst
diff --git a/doc/contributor-guide/source/doc-tools/scripts.rst b/doc/doc-contrib-guide/source/doc-tools/scripts.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/scripts.rst
rename to doc/doc-contrib-guide/source/doc-tools/scripts.rst
diff --git a/doc/contributor-guide/source/doc-tools/template-generator.rst b/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
similarity index 100%
rename from doc/contributor-guide/source/doc-tools/template-generator.rst
rename to doc/doc-contrib-guide/source/doc-tools/template-generator.rst
diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/doc-contrib-guide/source/docs-builds.rst
similarity index 98%
rename from doc/contributor-guide/source/docs-builds.rst
rename to doc/doc-contrib-guide/source/docs-builds.rst
index 7313f208f6..21768bfa07 100644
--- a/doc/contributor-guide/source/docs-builds.rst
+++ b/doc/doc-contrib-guide/source/docs-builds.rst
@@ -26,8 +26,8 @@ The value of ``new-branch`` is any name you want to give to your branch.
 
 To work on a file, use a text editor and open the ``.rst`` file from the same
 navigational path as the path shown in the HTML URL. For example,
-https://docs.openstack.org/contributor-guide/docs-builds.html, is found in the
-folder: ``openstack-manuals/doc/contributor-guide/docs-builds.rst``.
+https://docs.openstack.org/doc-contrib-guide/docs-builds.html, is found in the
+folder: ``openstack-manuals/doc/doc-contrib-guide/docs-builds.rst``.
 
 Refer to :doc:`Writing documentation <writing-docs>` for details on how to
 create content and contribute to the documentation.
diff --git a/doc/contributor-guide/source/docs-review-guidelines.rst b/doc/doc-contrib-guide/source/docs-review-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/docs-review-guidelines.rst
rename to doc/doc-contrib-guide/source/docs-review-guidelines.rst
diff --git a/doc/contributor-guide/source/docs-review.rst b/doc/doc-contrib-guide/source/docs-review.rst
similarity index 100%
rename from doc/contributor-guide/source/docs-review.rst
rename to doc/doc-contrib-guide/source/docs-review.rst
diff --git a/doc/contributor-guide/source/figures/doc-logo-fox.jpg b/doc/doc-contrib-guide/source/figures/doc-logo-fox.jpg
similarity index 100%
rename from doc/contributor-guide/source/figures/doc-logo-fox.jpg
rename to doc/doc-contrib-guide/source/figures/doc-logo-fox.jpg
diff --git a/doc/contributor-guide/source/figures/workflow-diagram.png b/doc/doc-contrib-guide/source/figures/workflow-diagram.png
similarity index 100%
rename from doc/contributor-guide/source/figures/workflow-diagram.png
rename to doc/doc-contrib-guide/source/figures/workflow-diagram.png
diff --git a/doc/contributor-guide/source/index.rst b/doc/doc-contrib-guide/source/index.rst
similarity index 100%
rename from doc/contributor-guide/source/index.rst
rename to doc/doc-contrib-guide/source/index.rst
diff --git a/doc/contributor-guide/source/json-conv.rst b/doc/doc-contrib-guide/source/json-conv.rst
similarity index 100%
rename from doc/contributor-guide/source/json-conv.rst
rename to doc/doc-contrib-guide/source/json-conv.rst
diff --git a/doc/contributor-guide/source/landing-pages.rst b/doc/doc-contrib-guide/source/landing-pages.rst
similarity index 100%
rename from doc/contributor-guide/source/landing-pages.rst
rename to doc/doc-contrib-guide/source/landing-pages.rst
diff --git a/doc/contributor-guide/source/non-native-english-speakers.rst b/doc/doc-contrib-guide/source/non-native-english-speakers.rst
similarity index 100%
rename from doc/contributor-guide/source/non-native-english-speakers.rst
rename to doc/doc-contrib-guide/source/non-native-english-speakers.rst
diff --git a/doc/contributor-guide/source/project-deploy-guide.rst b/doc/doc-contrib-guide/source/project-deploy-guide.rst
similarity index 100%
rename from doc/contributor-guide/source/project-deploy-guide.rst
rename to doc/doc-contrib-guide/source/project-deploy-guide.rst
diff --git a/doc/contributor-guide/source/project-guides.rst b/doc/doc-contrib-guide/source/project-guides.rst
similarity index 100%
rename from doc/contributor-guide/source/project-guides.rst
rename to doc/doc-contrib-guide/source/project-guides.rst
diff --git a/doc/contributor-guide/source/project-install-guide.rst b/doc/doc-contrib-guide/source/project-install-guide.rst
similarity index 100%
rename from doc/contributor-guide/source/project-install-guide.rst
rename to doc/doc-contrib-guide/source/project-install-guide.rst
diff --git a/doc/contributor-guide/source/quickstart.rst b/doc/doc-contrib-guide/source/quickstart.rst
similarity index 100%
rename from doc/contributor-guide/source/quickstart.rst
rename to doc/doc-contrib-guide/source/quickstart.rst
diff --git a/doc/contributor-guide/source/quickstart/developers.rst b/doc/doc-contrib-guide/source/quickstart/developers.rst
similarity index 100%
rename from doc/contributor-guide/source/quickstart/developers.rst
rename to doc/doc-contrib-guide/source/quickstart/developers.rst
diff --git a/doc/contributor-guide/source/quickstart/first-timers.rst b/doc/doc-contrib-guide/source/quickstart/first-timers.rst
similarity index 100%
rename from doc/contributor-guide/source/quickstart/first-timers.rst
rename to doc/doc-contrib-guide/source/quickstart/first-timers.rst
diff --git a/doc/contributor-guide/source/quickstart/new-projects.rst b/doc/doc-contrib-guide/source/quickstart/new-projects.rst
similarity index 100%
rename from doc/contributor-guide/source/quickstart/new-projects.rst
rename to doc/doc-contrib-guide/source/quickstart/new-projects.rst
diff --git a/doc/contributor-guide/source/release.rst b/doc/doc-contrib-guide/source/release.rst
similarity index 100%
rename from doc/contributor-guide/source/release.rst
rename to doc/doc-contrib-guide/source/release.rst
diff --git a/doc/contributor-guide/source/release/release-tools.rst b/doc/doc-contrib-guide/source/release/release-tools.rst
similarity index 100%
rename from doc/contributor-guide/source/release/release-tools.rst
rename to doc/doc-contrib-guide/source/release/release-tools.rst
diff --git a/doc/contributor-guide/source/release/taskdetail.rst b/doc/doc-contrib-guide/source/release/taskdetail.rst
similarity index 100%
rename from doc/contributor-guide/source/release/taskdetail.rst
rename to doc/doc-contrib-guide/source/release/taskdetail.rst
diff --git a/doc/contributor-guide/source/release/taskoverview.rst b/doc/doc-contrib-guide/source/release/taskoverview.rst
similarity index 100%
rename from doc/contributor-guide/source/release/taskoverview.rst
rename to doc/doc-contrib-guide/source/release/taskoverview.rst
diff --git a/doc/contributor-guide/source/rst-conv.rst b/doc/doc-contrib-guide/source/rst-conv.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv.rst
rename to doc/doc-contrib-guide/source/rst-conv.rst
diff --git a/doc/contributor-guide/source/rst-conv/comment.rst b/doc/doc-contrib-guide/source/rst-conv/comment.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/comment.rst
rename to doc/doc-contrib-guide/source/rst-conv/comment.rst
diff --git a/doc/contributor-guide/source/rst-conv/decorations.rst b/doc/doc-contrib-guide/source/rst-conv/decorations.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/decorations.rst
rename to doc/doc-contrib-guide/source/rst-conv/decorations.rst
diff --git a/doc/contributor-guide/source/rst-conv/figures.rst b/doc/doc-contrib-guide/source/rst-conv/figures.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/figures.rst
rename to doc/doc-contrib-guide/source/rst-conv/figures.rst
diff --git a/doc/contributor-guide/source/rst-conv/file-naming.rst b/doc/doc-contrib-guide/source/rst-conv/file-naming.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/file-naming.rst
rename to doc/doc-contrib-guide/source/rst-conv/file-naming.rst
diff --git a/doc/contributor-guide/source/rst-conv/general-guidelines.rst b/doc/doc-contrib-guide/source/rst-conv/general-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/general-guidelines.rst
rename to doc/doc-contrib-guide/source/rst-conv/general-guidelines.rst
diff --git a/doc/contributor-guide/source/rst-conv/inline-markups.rst b/doc/doc-contrib-guide/source/rst-conv/inline-markups.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/inline-markups.rst
rename to doc/doc-contrib-guide/source/rst-conv/inline-markups.rst
diff --git a/doc/contributor-guide/source/rst-conv/lists.rst b/doc/doc-contrib-guide/source/rst-conv/lists.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/lists.rst
rename to doc/doc-contrib-guide/source/rst-conv/lists.rst
diff --git a/doc/contributor-guide/source/rst-conv/profiling.rst b/doc/doc-contrib-guide/source/rst-conv/profiling.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/profiling.rst
rename to doc/doc-contrib-guide/source/rst-conv/profiling.rst
diff --git a/doc/contributor-guide/source/rst-conv/references.rst b/doc/doc-contrib-guide/source/rst-conv/references.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/references.rst
rename to doc/doc-contrib-guide/source/rst-conv/references.rst
diff --git a/doc/contributor-guide/source/rst-conv/rst2bash.rst b/doc/doc-contrib-guide/source/rst-conv/rst2bash.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/rst2bash.rst
rename to doc/doc-contrib-guide/source/rst-conv/rst2bash.rst
diff --git a/doc/contributor-guide/source/rst-conv/source-code.rst b/doc/doc-contrib-guide/source/rst-conv/source-code.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/source-code.rst
rename to doc/doc-contrib-guide/source/rst-conv/source-code.rst
diff --git a/doc/contributor-guide/source/rst-conv/specific-info.rst b/doc/doc-contrib-guide/source/rst-conv/specific-info.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/specific-info.rst
rename to doc/doc-contrib-guide/source/rst-conv/specific-info.rst
diff --git a/doc/contributor-guide/source/rst-conv/tables.rst b/doc/doc-contrib-guide/source/rst-conv/tables.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/tables.rst
rename to doc/doc-contrib-guide/source/rst-conv/tables.rst
diff --git a/doc/contributor-guide/source/rst-conv/titles.rst b/doc/doc-contrib-guide/source/rst-conv/titles.rst
similarity index 100%
rename from doc/contributor-guide/source/rst-conv/titles.rst
rename to doc/doc-contrib-guide/source/rst-conv/titles.rst
diff --git a/doc/contributor-guide/source/team-structure.rst b/doc/doc-contrib-guide/source/team-structure.rst
similarity index 100%
rename from doc/contributor-guide/source/team-structure.rst
rename to doc/doc-contrib-guide/source/team-structure.rst
diff --git a/doc/contributor-guide/source/topic-structure.rst b/doc/doc-contrib-guide/source/topic-structure.rst
similarity index 100%
rename from doc/contributor-guide/source/topic-structure.rst
rename to doc/doc-contrib-guide/source/topic-structure.rst
diff --git a/doc/contributor-guide/source/topic-tags.rst b/doc/doc-contrib-guide/source/topic-tags.rst
similarity index 100%
rename from doc/contributor-guide/source/topic-tags.rst
rename to doc/doc-contrib-guide/source/topic-tags.rst
diff --git a/doc/contributor-guide/source/user-guidelines.rst b/doc/doc-contrib-guide/source/user-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/user-guidelines.rst
rename to doc/doc-contrib-guide/source/user-guidelines.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-actions.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-actions.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-actions.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-actions.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-actions.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-actions.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-actions.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-actions.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-cancelbutton.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-errors.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-errors.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-errors.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-errors.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-errors.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-errors.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-errors.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-errors.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-modalerror.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-modalerror.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-modalerror.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-modalerror.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-modalerror.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-modalerror.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-modalerror.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-modalerror.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-search.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-search.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-search.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-search.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-search.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-search.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-search.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-search.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-wizards.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-wizards.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-wizards.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-wizards.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/gui-wizards.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-wizards.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/gui-wizards.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/gui-wizards.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/persona-ecosystem.png b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/persona-ecosystem.png
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/persona-ecosystem.png
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/persona-ecosystem.png
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/persona-ecosystem.svg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/persona-ecosystem.svg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/persona-ecosystem.svg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/persona-ecosystem.svg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/figures/ui-text-cheatsheet.jpg b/doc/doc-contrib-guide/source/ux-ui-guidelines/figures/ui-text-cheatsheet.jpg
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/figures/ui-text-cheatsheet.jpg
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/figures/ui-text-cheatsheet.jpg
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/gui-guidelines.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/gui-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/gui-guidelines.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/gui-guidelines.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/app-developer.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/app-developer.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/app-developer.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/app-developer.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/cloud-ops.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/cloud-ops.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/cloud-ops.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/cloud-ops.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/domain-operator.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/domain-operator.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/domain-operator.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/domain-operator.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/infrastructure-arch.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/infrastructure-arch.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/infrastructure-arch.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/infrastructure-arch.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/model-companies.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/model-companies.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/model-companies.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/model-companies.rst
diff --git a/doc/contributor-guide/source/ux-ui-guidelines/ux-personas/project-owner.rst b/doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/project-owner.rst
similarity index 100%
rename from doc/contributor-guide/source/ux-ui-guidelines/ux-personas/project-owner.rst
rename to doc/doc-contrib-guide/source/ux-ui-guidelines/ux-personas/project-owner.rst
diff --git a/doc/contributor-guide/source/vendor-drivers.rst b/doc/doc-contrib-guide/source/vendor-drivers.rst
similarity index 100%
rename from doc/contributor-guide/source/vendor-drivers.rst
rename to doc/doc-contrib-guide/source/vendor-drivers.rst
diff --git a/doc/contributor-guide/source/writing-docs.rst b/doc/doc-contrib-guide/source/writing-docs.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-docs.rst
rename to doc/doc-contrib-guide/source/writing-docs.rst
diff --git a/doc/contributor-guide/source/writing-style.rst b/doc/doc-contrib-guide/source/writing-style.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style.rst
rename to doc/doc-contrib-guide/source/writing-style.rst
diff --git a/doc/contributor-guide/source/writing-style/code-conventions.rst b/doc/doc-contrib-guide/source/writing-style/code-conventions.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/code-conventions.rst
rename to doc/doc-contrib-guide/source/writing-style/code-conventions.rst
diff --git a/doc/contributor-guide/source/writing-style/general-writing-guidelines.rst b/doc/doc-contrib-guide/source/writing-style/general-writing-guidelines.rst
similarity index 99%
rename from doc/contributor-guide/source/writing-style/general-writing-guidelines.rst
rename to doc/doc-contrib-guide/source/writing-style/general-writing-guidelines.rst
index 46bd8ccf6f..a78ad7c865 100644
--- a/doc/contributor-guide/source/writing-style/general-writing-guidelines.rst
+++ b/doc/doc-contrib-guide/source/writing-style/general-writing-guidelines.rst
@@ -211,7 +211,7 @@ Each title should include a clear description of the page’s subject.
 
 Also, ensure that you follow the documentation guidelines for titles.
 For more information, see `Titles
-<https://docs.openstack.org/contributor-guide/rst-conv/titles.html>`_.
+<https://docs.openstack.org/doc-contrib-guide/rst-conv/titles.html>`_.
 
 .. _be_clear_and_concise:
 
diff --git a/doc/contributor-guide/source/writing-style/headings.rst b/doc/doc-contrib-guide/source/writing-style/headings.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/headings.rst
rename to doc/doc-contrib-guide/source/writing-style/headings.rst
diff --git a/doc/contributor-guide/source/writing-style/lists.rst b/doc/doc-contrib-guide/source/writing-style/lists.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/lists.rst
rename to doc/doc-contrib-guide/source/writing-style/lists.rst
diff --git a/doc/contributor-guide/source/writing-style/num_and_units_of_measure.rst b/doc/doc-contrib-guide/source/writing-style/num_and_units_of_measure.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/num_and_units_of_measure.rst
rename to doc/doc-contrib-guide/source/writing-style/num_and_units_of_measure.rst
diff --git a/doc/contributor-guide/source/writing-style/openstack-components.rst b/doc/doc-contrib-guide/source/writing-style/openstack-components.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/openstack-components.rst
rename to doc/doc-contrib-guide/source/writing-style/openstack-components.rst
diff --git a/doc/contributor-guide/source/writing-style/punctuation.rst b/doc/doc-contrib-guide/source/writing-style/punctuation.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/punctuation.rst
rename to doc/doc-contrib-guide/source/writing-style/punctuation.rst
diff --git a/doc/contributor-guide/source/writing-style/release-names.rst b/doc/doc-contrib-guide/source/writing-style/release-names.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/release-names.rst
rename to doc/doc-contrib-guide/source/writing-style/release-names.rst
diff --git a/doc/contributor-guide/source/writing-style/ui-terminology.rst b/doc/doc-contrib-guide/source/writing-style/ui-terminology.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/ui-terminology.rst
rename to doc/doc-contrib-guide/source/writing-style/ui-terminology.rst
diff --git a/doc/contributor-guide/source/writing-style/urls.rst b/doc/doc-contrib-guide/source/writing-style/urls.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/urls.rst
rename to doc/doc-contrib-guide/source/writing-style/urls.rst
diff --git a/doc/contributor-guide/source/writing-style/word-choice.rst b/doc/doc-contrib-guide/source/writing-style/word-choice.rst
similarity index 100%
rename from doc/contributor-guide/source/writing-style/word-choice.rst
rename to doc/doc-contrib-guide/source/writing-style/word-choice.rst
diff --git a/doc/glossary/source/conf.py b/doc/glossary/source/conf.py
index 9b111a077e..c92fc21204 100644
--- a/doc/glossary/source/conf.py
+++ b/doc/glossary/source/conf.py
@@ -199,7 +199,7 @@ html_show_sourcelink = False
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'contributor-guide'
+htmlhelp_basename = 'glossary'
 
 # If true, publish source files
 html_copy_source = False
diff --git a/releasenotes/source/newton.rst b/releasenotes/source/newton.rst
index 12d0695731..39b4e90f1c 100644
--- a/releasenotes/source/newton.rst
+++ b/releasenotes/source/newton.rst
@@ -48,7 +48,7 @@ API guides
   examples of the new API reference, maintained by the project team rather
   than a central docs team.
 
-* Updated the `Contributor Guide <https://docs.openstack.org/contributor-guide/api-guides.html>`__
+* Updated the `Contributor Guide <https://docs.openstack.org/doc-contrib-guide/api-guides.html>`__
   to include specific API Guides information.
 
 * Completed `API Documentation <https://specs.openstack.org/openstack/api-wg/guidelines/api-docs.html>`__
diff --git a/tools/build-all-rst.sh b/tools/build-all-rst.sh
index 6bf47c90a1..68c59ae227 100755
--- a/tools/build-all-rst.sh
+++ b/tools/build-all-rst.sh
@@ -32,7 +32,7 @@ PDF_TARGETS=( 'arch-design'\
               'image-guide' \
               'install-guide')
 
-for guide in arch-design contributor-guide glossary \
+for guide in arch-design doc-contrib-guide glossary \
     ha-guide ha-guide-draft image-guide install-guide; do
     if [[ ${PDF_TARGETS[*]} =~ $guide ]]; then
         tools/build-rst.sh doc/$guide --build build \
diff --git a/www/.htaccess b/www/.htaccess
index fdc71e0779..a2a667cdb0 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -78,12 +78,15 @@ redirectmatch 301 ^/arch-design/content/.*$ /arch-design/
 redirectmatch 301 ^/image-guide/content/.*$ /image-guide/
 redirectmatch 301 ^/admin-guide-cloud/.*$ /{{RELEASED_SERIES}}/admin/
 redirectmatch 301 ^/trunk/openstack-compute/.*$ /nova/latest/admin/
-redirect 301 /glossary/content/glossary.html /contributor-guide/common/glossary.html
+redirect 301 /glossary/content/glossary.html /doc-contrib-guide/common/glossary.html
 redirect 301 /icehouse/training-guides/ /upstream-training/
 
+# Redirect contributor-guide URL to doc-contrib-guide
+redirectmatch 301 ^/contributor-guide/(.*)$ /doc-contrib-guide/$1
+
 # Redirect changed directory name in the Contributor Guide
-redirect 301 /contributor-guide/ui-text-guidelines.html /contributor-guide/ux-ui-guidelines/ui-text-guidelines.html
-redirect 301 /contributor-guide/ui-text-guidelines /contributor-guide/ux-ui-guidelines
+redirect 301 /doc-contrib-guide/ui-text-guidelines.html /doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines.html
+redirect 301 /doc-contrib-guide/ui-text-guidelines /doc-contrib-guide/ux-ui-guidelines
 
 # Redirect any deploy guide project directory back to the current stable index
 redirectmatch 301 "^/project-deploy-guide/$" /{{RELEASED_SERIES}}/deploy/
diff --git a/www/de/index.html b/www/de/index.html
index 754a5649c2..c3896a3dd5 100644
--- a/www/de/index.html
+++ b/www/de/index.html
@@ -105,7 +105,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Verwaltung der Dokumentation wie Quellcode, angetrieben von der Gemeinschaft - interessiert?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">Wie kann man mitarbeiten <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/index.html" class="overview-btn contribute-btn">Wie kann man mitarbeiten <i class="fa fa-chevron-right"></i></a>
             </div>
             <div class="col-lg-12">
                 <p>Unterstützung des Detuschen Übersetzerteams</p>
diff --git a/www/fr/index.html b/www/fr/index.html
index 270dc3ba00..7b620db7e7 100644
--- a/www/fr/index.html
+++ b/www/fr/index.html
@@ -56,7 +56,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>La documentation gérée comme du code et propulsée par la communauté - intéressé ?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">Comment contribuer <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/index.html" class="overview-btn contribute-btn">Comment contribuer <i class="fa fa-chevron-right"></i></a>
             </div>
             <div class="col-lg-12">
                 <p>Participer</p>
diff --git a/www/id/index.html b/www/id/index.html
index bd6125a66c..57375b38da 100644
--- a/www/id/index.html
+++ b/www/id/index.html
@@ -79,7 +79,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Dokumentasi diperlakukan seperti kode, didukung oleh masyarakat yang tertarik?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">Cara berkontribusi <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">Cara berkontribusi <i class="fa fa-chevron-right"></i></a>
                     <p>Untuk berpartisipasi dalam terjemahan dokumentasi dan proyek OpenStack, silahkan bergabung dengan <a href="https://translate.openstack.org/language/view/id">tim penerjemah Indonesia di Zanata</a>.</p>
                 </div>
             </div>
diff --git a/www/ja/index.html b/www/ja/index.html
index 203757fbd1..27689f41ef 100644
--- a/www/ja/index.html
+++ b/www/ja/index.html
@@ -90,7 +90,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>ドキュメントは、コードのように取り扱われ、コミュニティにより作成されています。興味がありますか?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
             <div class="col-lg-12">
                 <p>OpenStack ドキュメントの翻訳は <a href="https://wiki.openstack.org/wiki/I18nTeam/team/ja">OpenStack I18N team</a> が担当しています。</p>
diff --git a/www/ko_KR/index.html b/www/ko_KR/index.html
index 4a8b3dc9b0..baaa6c4c8f 100644
--- a/www/ko_KR/index.html
+++ b/www/ko_KR/index.html
@@ -86,7 +86,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>문서들 또한 코드처럼 커뮤니티에서 관리됩니다 - 관심 있으신가요?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">기여하려면 <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">기여하려면 <i class="fa fa-chevron-right"></i></a>
                 </div>
                 <div class="col-lg-12">
                     <p>한국어 번역에 참여하시고 싶으신 분께서는 <a href="https://wiki.openstack.org/wiki/I18nTeam/team/ko_KR">한국 번역팀 Wiki page</a>를 확인하세요.</p>
diff --git a/www/mitaka/api/index.html b/www/mitaka/api/index.html
index 6b27af3ef8..c40f66d47f 100644
--- a/www/mitaka/api/index.html
+++ b/www/mitaka/api/index.html
@@ -56,7 +56,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/newton/api/index.html b/www/newton/api/index.html
index 6b27af3ef8..c40f66d47f 100644
--- a/www/newton/api/index.html
+++ b/www/newton/api/index.html
@@ -56,7 +56,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/newton/deploy/index.html b/www/newton/deploy/index.html
index 0604bde5fe..f84c68ef5a 100644
--- a/www/newton/deploy/index.html
+++ b/www/newton/deploy/index.html
@@ -27,7 +27,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/newton/install/index.html b/www/newton/install/index.html
index 8aa0c26341..a12793c284 100644
--- a/www/newton/install/index.html
+++ b/www/newton/install/index.html
@@ -169,7 +169,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/ocata/api/index.html b/www/ocata/api/index.html
index 6b27af3ef8..c40f66d47f 100644
--- a/www/ocata/api/index.html
+++ b/www/ocata/api/index.html
@@ -56,7 +56,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/ocata/deploy/index.html b/www/ocata/deploy/index.html
index e1a0d9ff40..7bbf46e722 100644
--- a/www/ocata/deploy/index.html
+++ b/www/ocata/deploy/index.html
@@ -28,7 +28,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/ocata/index.html b/www/ocata/index.html
index 2c43158c38..ee17fb058f 100644
--- a/www/ocata/index.html
+++ b/www/ocata/index.html
@@ -69,8 +69,8 @@
         <p>Documentation for the OpenStack Python bindings and clients</p>
       </div>
       <div class="docs-link-sections">
-        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+        <h3 id="doc-contrib-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+        <a href="/doc-contrib-guide/index.html">OpenStack Documentation Contributor Guide</a>
         <p>Documentation workflow and conventions</p>
         <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
         <p>OpenStack Technical Committee reference documents and official resolutions</p>
diff --git a/www/ocata/install/index.html b/www/ocata/install/index.html
index ced9939ca7..e6c56b83f9 100644
--- a/www/ocata/install/index.html
+++ b/www/ocata/install/index.html
@@ -82,7 +82,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/ocata/install/obs-services.html b/www/ocata/install/obs-services.html
index 13eb3b2ea9..4d41c95bf9 100644
--- a/www/ocata/install/obs-services.html
+++ b/www/ocata/install/obs-services.html
@@ -93,7 +93,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/ocata/install/rdo-services.html b/www/ocata/install/rdo-services.html
index 183c6263b7..966cb4f6a7 100644
--- a/www/ocata/install/rdo-services.html
+++ b/www/ocata/install/rdo-services.html
@@ -94,7 +94,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/ocata/install/ubuntu-services.html b/www/ocata/install/ubuntu-services.html
index e73113010e..75376689a9 100644
--- a/www/ocata/install/ubuntu-services.html
+++ b/www/ocata/install/ubuntu-services.html
@@ -93,7 +93,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/ocata/language-bindings.html b/www/ocata/language-bindings.html
index c2e6fcab2b..e912f05289 100644
--- a/www/ocata/language-bindings.html
+++ b/www/ocata/language-bindings.html
@@ -116,7 +116,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/ocata/projects.html b/www/ocata/projects.html
index bc0b48d6e7..9417fbef75 100644
--- a/www/ocata/projects.html
+++ b/www/ocata/projects.html
@@ -237,7 +237,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/pike/admin/index.html b/www/pike/admin/index.html
index ba9ac6117d..947df52c07 100644
--- a/www/pike/admin/index.html
+++ b/www/pike/admin/index.html
@@ -47,7 +47,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/pike/api/index.html b/www/pike/api/index.html
index 928f977c43..e7c66c1c9e 100644
--- a/www/pike/api/index.html
+++ b/www/pike/api/index.html
@@ -57,7 +57,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/pike/configuration/index.html b/www/pike/configuration/index.html
index 2ce71ecf02..9a195fee77 100644
--- a/www/pike/configuration/index.html
+++ b/www/pike/configuration/index.html
@@ -50,7 +50,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/pike/deploy/index.html b/www/pike/deploy/index.html
index 22c5479314..53710bc8c7 100644
--- a/www/pike/deploy/index.html
+++ b/www/pike/deploy/index.html
@@ -30,7 +30,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/pike/index.html b/www/pike/index.html
index 84a3974344..3ef077a56c 100644
--- a/www/pike/index.html
+++ b/www/pike/index.html
@@ -64,8 +64,8 @@
         <p>Documentation for the OpenStack Python bindings and clients</p>
       </div>
       <div class="docs-link-sections">
-        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+        <h3 id="doc-contrib-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+        <a href="/doc-contrib-guide/index.html">OpenStack Documentation Contributor Guide</a>
         <p>Documentation workflow and conventions</p>
         <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
         <p>OpenStack Technical Committee reference documents and official resolutions</p>
diff --git a/www/pike/install/index.html b/www/pike/install/index.html
index 3dc1bdf579..b10b410302 100644
--- a/www/pike/install/index.html
+++ b/www/pike/install/index.html
@@ -56,7 +56,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/pike/language-bindings.html b/www/pike/language-bindings.html
index 83b4b72374..e41849887d 100644
--- a/www/pike/language-bindings.html
+++ b/www/pike/language-bindings.html
@@ -54,7 +54,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/pike/projects.html b/www/pike/projects.html
index 630c57ca42..2bc90195db 100644
--- a/www/pike/projects.html
+++ b/www/pike/projects.html
@@ -95,7 +95,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/pike/user/index.html b/www/pike/user/index.html
index d9ac827a60..975427d041 100644
--- a/www/pike/user/index.html
+++ b/www/pike/user/index.html
@@ -53,7 +53,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/project-data/README.rst b/www/project-data/README.rst
index 719a7f5fca..b9fbd438b5 100644
--- a/www/project-data/README.rst
+++ b/www/project-data/README.rst
@@ -1,3 +1,3 @@
 See
-https://docs.openstack.org/contributor-guide/doc-tools/template-generator.html
+https://docs.openstack.org/doc-contrib-guide/doc-tools/template-generator.html
 for details.
diff --git a/www/queens/admin/index.html b/www/queens/admin/index.html
index ba9ac6117d..947df52c07 100644
--- a/www/queens/admin/index.html
+++ b/www/queens/admin/index.html
@@ -47,7 +47,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/queens/api/index.html b/www/queens/api/index.html
index 928f977c43..e7c66c1c9e 100644
--- a/www/queens/api/index.html
+++ b/www/queens/api/index.html
@@ -57,7 +57,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/queens/configuration/index.html b/www/queens/configuration/index.html
index 2ce71ecf02..9a195fee77 100644
--- a/www/queens/configuration/index.html
+++ b/www/queens/configuration/index.html
@@ -50,7 +50,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/queens/deploy/index.html b/www/queens/deploy/index.html
index 22c5479314..53710bc8c7 100644
--- a/www/queens/deploy/index.html
+++ b/www/queens/deploy/index.html
@@ -30,7 +30,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/queens/index.html b/www/queens/index.html
index 84a3974344..3ef077a56c 100644
--- a/www/queens/index.html
+++ b/www/queens/index.html
@@ -64,8 +64,8 @@
         <p>Documentation for the OpenStack Python bindings and clients</p>
       </div>
       <div class="docs-link-sections">
-        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+        <h3 id="doc-contrib-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+        <a href="/doc-contrib-guide/index.html">OpenStack Documentation Contributor Guide</a>
         <p>Documentation workflow and conventions</p>
         <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
         <p>OpenStack Technical Committee reference documents and official resolutions</p>
diff --git a/www/queens/install/index.html b/www/queens/install/index.html
index 3dc1bdf579..b10b410302 100644
--- a/www/queens/install/index.html
+++ b/www/queens/install/index.html
@@ -56,7 +56,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/queens/language-bindings.html b/www/queens/language-bindings.html
index 83b4b72374..e41849887d 100644
--- a/www/queens/language-bindings.html
+++ b/www/queens/language-bindings.html
@@ -54,7 +54,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="/contributor-guide/" class="overview-btn contribute-btn"
+                    <a href="/doc-contrib-guide/" class="overview-btn contribute-btn"
                     >How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
diff --git a/www/queens/projects.html b/www/queens/projects.html
index 630c57ca42..2bc90195db 100644
--- a/www/queens/projects.html
+++ b/www/queens/projects.html
@@ -95,7 +95,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/queens/user/index.html b/www/queens/user/index.html
index d9ac827a60..975427d041 100644
--- a/www/queens/user/index.html
+++ b/www/queens/user/index.html
@@ -53,7 +53,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="/doc-contrib-guide/" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt
index 2d78157c5c..038973a5d3 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -118,12 +118,16 @@
 /admin-guide-cloud/any-page.html 301 /{{RELEASED_SERIES}}/admin/
 /trunk/openstack-compute/ 301 /nova/latest/admin/
 /trunk/openstack-compute/any-page.html 301 /nova/latest/admin/
-/glossary/content/glossary.html 301 /contributor-guide/common/glossary.html
+/glossary/content/glossary.html 301 /doc-contrib-guide/common/glossary.html
 /icehouse/training-guides/ 301 /upstream-training/
 
-# Redirect changed directory name in the Contributor Guide
-/contributor-guide/ui-text-guidelines.html 301 /contributor-guide/ux-ui-guidelines/ui-text-guidelines.html
-/contributor-guide/ui-text-guidelines 301 /contributor-guide/ux-ui-guidelines
+# Redirect changed directory name for the Contributor Guide
+/contributor-guide/ 301 /doc-contrib-guide/
+/contributor-guide/index.html 301 /doc-contrib-guide/index.html
+
+# Redirect changed sub-directory name in the Contributor Guide
+/doc-contrib-guide/ui-text-guidelines.html 301 /doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines.html
+/doc-contrib-guide/ui-text-guidelines 301 /doc-contrib-guide/ux-ui-guidelines
 
 # Redirect any deploy guide project directory back to the current stable index
 /project-deploy-guide/ 301 /{{RELEASED_SERIES}}/deploy/
diff --git a/www/static/sitemap.xml b/www/static/sitemap.xml
index 1191c12d06..d9a9b2e276 100644
--- a/www/static/sitemap.xml
+++ b/www/static/sitemap.xml
@@ -67,7 +67,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/index.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/index.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -133,7 +133,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -511,25 +511,25 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-docs.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-docs.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-impact.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-impact.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-bugs.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-bugs.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/api-guides.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/api-guides.html</loc>
     <lastmod>2017-09-04T18:50:31+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -913,7 +913,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/additional-git-workflow/rebase.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/additional-git-workflow/rebase.html</loc>
     <lastmod>2017-09-04T18:50:30+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -160627,7 +160627,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/contributor_index.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/contributor_index.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -160897,13 +160897,13 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/dev_guidelines.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/dev_guidelines.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/how_to_contribute.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/how_to_contribute.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -160915,7 +160915,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/stable_branches.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/stable_branches.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -160993,43 +160993,43 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/contributor_index.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/contributor_index.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/doc_guidelines.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/doc_guidelines.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/testing.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/testing.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/dev_env.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/dev_env.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/plugins/manage_plugins.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/plugins/manage_plugins.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/plugins/murano_plugins.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/plugins/murano_plugins.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/contributor-guide/plugins.html</loc>
+    <loc>https://docs.openstack.org/murano/ocata/doc-contrib-guide/plugins.html</loc>
     <lastmod>2017-05-16T07:43:16+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -161257,19 +161257,19 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/stable_branches.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/stable_branches.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/how_to_contribute.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/how_to_contribute.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/dev_guidelines.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/dev_guidelines.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -161341,25 +161341,25 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/plugins/murano_plugins.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/plugins/murano_plugins.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/dev_env.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/dev_env.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/testing.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/testing.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/doc_guidelines.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/doc_guidelines.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -161461,7 +161461,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/plugins.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/plugins.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -161941,7 +161941,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/murano/ocata/_sources/contributor-guide/plugins/manage_plugins.txt</loc>
+    <loc>https://docs.openstack.org/murano/ocata/_sources/doc-contrib-guide/plugins/manage_plugins.txt</loc>
     <lastmod>2017-05-16T07:41:13+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -171817,79 +171817,79 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/search.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/search.html</loc>
     <lastmod>2017-09-04T18:50:40+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/release/release-tools.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/release/release-tools.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/release/taskdetail.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/release/taskdetail.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/release/taskoverview.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/release/taskoverview.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/release.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/release.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/contributing.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/contributing.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/config-reference.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/config-reference.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/cli-reference.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/cli-reference.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/installation.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/installation.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/template-generator.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/template-generator.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools/scripts.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools/scripts.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tools.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tools.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/docs-builds.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/docs-builds.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -171985,7 +171985,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/common/glossary.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/common/glossary.html</loc>
     <lastmod>2017-09-04T18:50:31+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173221,37 +173221,37 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/docs-review-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/docs-review-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/docs-review.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/docs-review.html</loc>
     <lastmod>2017-09-04T18:50:33+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/diagram-guidelines/general-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/diagram-guidelines/general-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/diagram-guidelines/files.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/diagram-guidelines/files.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/diagram-guidelines/tools.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/diagram-guidelines/tools.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/diagram-guidelines/diagram-usage.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/diagram-guidelines/diagram-usage.html</loc>
     <lastmod>2017-09-04T18:50:31+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173317,13 +173317,13 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/rst2bash.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/rst2bash.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/tables.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/tables.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173335,19 +173335,19 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/references.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/references.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/profiling.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/profiling.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/comment.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/comment.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173371,7 +173371,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/figures.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/figures.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173413,7 +173413,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/json-conv.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/json-conv.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173431,7 +173431,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/decorations.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/decorations.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -173623,7 +173623,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/diagram-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/diagram-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:31+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175075,67 +175075,67 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/user-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/user-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/source-code.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/source-code.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/general-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/general-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/gui-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/gui-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/file-naming.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/file-naming.html</loc>
     <lastmod>2017-09-04T18:50:35+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ui-text-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/lists.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/lists.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/ui-terminology.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/ui-terminology.html</loc>
     <lastmod>2017-09-04T18:50:40+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175147,7 +175147,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/specific-info.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/specific-info.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175159,91 +175159,91 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/inline-markups.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/inline-markups.html</loc>
     <lastmod>2017-09-04T18:50:36+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/headings.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/headings.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/additional-git-workflow.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/additional-git-workflow.html</loc>
     <lastmod>2017-09-04T18:50:30+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/punctuation.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/punctuation.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/code-conventions.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/code-conventions.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/rst-conv/titles.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/rst-conv/titles.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/word-choice.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/word-choice.html</loc>
     <lastmod>2017-09-04T18:50:40+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/openstack-components.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/openstack-components.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/num_and_units_of_measure.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/num_and_units_of_measure.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/urls.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/urls.html</loc>
     <lastmod>2017-09-04T18:50:40+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/topic-tags.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/topic-tags.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/general-writing-guidelines.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/general-writing-guidelines.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/release-names.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/release-names.html</loc>
     <lastmod>2017-09-04T18:50:40+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/writing-style/lists.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/writing-style/lists.html</loc>
     <lastmod>2017-09-04T18:50:39+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/vendor-drivers.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/vendor-drivers.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175441,61 +175441,61 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines/ui-panel-formatting.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines/ui-error-messages.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines/ui-action-labels.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ui-text-guidelines/ui-text-capitalization.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/model-companies.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/model-companies.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/app-developer.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/app-developer.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/project-owner.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/project-owner.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/domain-operator.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/domain-operator.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/cloud-ops.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/cloud-ops.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/ux-ui-guidelines/ux-personas/infrastructure-arch.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/ux-ui-guidelines/ux-personas/infrastructure-arch.html</loc>
     <lastmod>2017-09-04T18:50:38+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175531,7 +175531,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/topic-structure.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/topic-structure.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -175567,79 +175567,79 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-tag.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-tag.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/doc-index.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/doc-index.html</loc>
     <lastmod>2017-09-04T18:50:32+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/landing-pages.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/landing-pages.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/project-deploy-guide.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/project-deploy-guide.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/project-install-guide.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/project-install-guide.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/project-guides.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/project-guides.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/blueprints-and-specs.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/blueprints-and-specs.html</loc>
     <lastmod>2017-09-04T18:50:31+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/non-native-english-speakers.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/non-native-english-speakers.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/team-structure.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/team-structure.html</loc>
     <lastmod>2017-09-04T18:50:37+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/quickstart/new-projects.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/quickstart/new-projects.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/quickstart/developers.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/quickstart/developers.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/quickstart/first-timers.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/quickstart/first-timers.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://docs.openstack.org/contributor-guide/quickstart.html</loc>
+    <loc>https://docs.openstack.org/doc-contrib-guide/quickstart.html</loc>
     <lastmod>2017-09-04T18:50:34+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index da0988adc5..c7817984a8 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -1,6 +1,6 @@
                     <div class="docs-link-sections">
-                        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-                        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+                        <h3 id="doc-contrib-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+                        <a href="/doc-contrib-guide/index.html">OpenStack Documentation Contributor Guide</a>
                         <p>Documentation workflow and conventions</p>
                         <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
                         <p>OpenStack Technical Committee reference documents and official resolutions</p>
diff --git a/www/templates/indexbase.tmpl b/www/templates/indexbase.tmpl
index d2cea55a70..ab3eb0f534 100644
--- a/www/templates/indexbase.tmpl
+++ b/www/templates/indexbase.tmpl
@@ -54,7 +54,7 @@
       <div class="row docs-contribute-wrapper">
         <div class="col-lg-12">
           <p>Documentation treated like code, powered by the community - interested?</p>
-          <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+          <a href="/doc-contrib-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
         </div>
       </div>
     </div>