Merge "Update docs structure according to new guidelines in https://wiki.opnfv.org/display/DOC"

32 files changed, 6 insertions, 6 deletions

diff --git a/docs/requirements/NB_interface.rst b/docs/development/requirements/NB_interface.rst
index 8dba601..8dba601 100644
--- a/docs/requirements/NB_interface.rst
+++ b/docs/development/requirements/NB_interface.rst
diff --git a/docs/requirements/annex1.rst b/docs/development/requirements/annex1.rst
index 65a5f22..65a5f22 100644
--- a/docs/requirements/annex1.rst
+++ b/docs/development/requirements/annex1.rst
diff --git a/docs/requirements/architecture.rst b/docs/development/requirements/architecture.rst
index 3eb20d3..3eb20d3 100644
--- a/docs/requirements/architecture.rst
+++ b/docs/development/requirements/architecture.rst
diff --git a/docs/requirements/gap_analysis.rst b/docs/development/requirements/gap_analysis.rst
index 9e4ec5c..9e4ec5c 100644
--- a/docs/requirements/gap_analysis.rst
+++ b/docs/development/requirements/gap_analysis.rst
diff --git a/docs/requirements/glossary.rst b/docs/development/requirements/glossary.rst
index 48fd75b..48fd75b 100644
--- a/docs/requirements/glossary.rst
+++ b/docs/development/requirements/glossary.rst
diff --git a/docs/requirements/images/LICENSE b/docs/development/requirements/images/LICENSE
index 3b8719c..3b8719c 100644
--- a/docs/requirements/images/LICENSE
+++ b/docs/development/requirements/images/LICENSE
diff --git a/docs/requirements/images/computeflavor.png b/docs/development/requirements/images/computeflavor.png
index 3ea3dba..3ea3dba 100755
--- a/docs/requirements/images/computeflavor.png
+++ b/docs/development/requirements/images/computeflavor.png
diff --git a/docs/requirements/images/figure1.png b/docs/development/requirements/images/figure1.png
index 065a995..065a995 100644
--- a/docs/requirements/images/figure1.png
+++ b/docs/development/requirements/images/figure1.png
diff --git a/docs/requirements/images/figure2.png b/docs/development/requirements/images/figure2.png
index dd002a2..dd002a2 100755
--- a/docs/requirements/images/figure2.png
+++ b/docs/development/requirements/images/figure2.png
diff --git a/docs/requirements/images/figure3.png b/docs/development/requirements/images/figure3.png
index 20e51c7..20e51c7 100755
--- a/docs/requirements/images/figure3.png
+++ b/docs/development/requirements/images/figure3.png
diff --git a/docs/requirements/images/figure4.png b/docs/development/requirements/images/figure4.png
index e0c96a1..e0c96a1 100755
--- a/docs/requirements/images/figure4.png
+++ b/docs/development/requirements/images/figure4.png
diff --git a/docs/requirements/images/figure5.png b/docs/development/requirements/images/figure5.png
index 4e161f4..4e161f4 100755
--- a/docs/requirements/images/figure5.png
+++ b/docs/development/requirements/images/figure5.png
diff --git a/docs/requirements/images/figure5_new.png b/docs/development/requirements/images/figure5_new.png
index 9307aa2..9307aa2 100644
--- a/docs/requirements/images/figure5_new.png
+++ b/docs/development/requirements/images/figure5_new.png
diff --git a/docs/requirements/images/figure6.png b/docs/development/requirements/images/figure6.png
index 8aeec23..8aeec23 100755
--- a/docs/requirements/images/figure6.png
+++ b/docs/development/requirements/images/figure6.png
diff --git a/docs/requirements/images/figure6_new.png b/docs/development/requirements/images/figure6_new.png
index 5ec4b43..5ec4b43 100644
--- a/docs/requirements/images/figure6_new.png
+++ b/docs/development/requirements/images/figure6_new.png
diff --git a/docs/requirements/images/figure7_new.png b/docs/development/requirements/images/figure7_new.png
index 6684949..6684949 100644
--- a/docs/requirements/images/figure7_new.png
+++ b/docs/development/requirements/images/figure7_new.png
diff --git a/docs/requirements/impl_architecture.rst b/docs/development/requirements/impl_architecture.rst
index d7375d5..d7375d5 100644
--- a/docs/requirements/impl_architecture.rst
+++ b/docs/development/requirements/impl_architecture.rst
diff --git a/docs/requirements/index.rst b/docs/development/requirements/index.rst
index 00edf0e..00edf0e 100644
--- a/docs/requirements/index.rst
+++ b/docs/development/requirements/index.rst
diff --git a/docs/requirements/intro.rst b/docs/development/requirements/intro.rst
index 654fdf9..654fdf9 100644
--- a/docs/requirements/intro.rst
+++ b/docs/development/requirements/intro.rst
diff --git a/docs/requirements/references.rst b/docs/development/requirements/references.rst
index c498b66..c498b66 100644
--- a/docs/requirements/references.rst
+++ b/docs/development/requirements/references.rst
diff --git a/docs/requirements/revision.rst b/docs/development/requirements/revision.rst
index cd0b76b..cd0b76b 100644
--- a/docs/requirements/revision.rst
+++ b/docs/development/requirements/revision.rst
diff --git a/docs/requirements/schemas.rst b/docs/development/requirements/schemas.rst
index c98b7da..c98b7da 100644
--- a/docs/requirements/schemas.rst
+++ b/docs/development/requirements/schemas.rst
diff --git a/docs/requirements/summary.rst b/docs/development/requirements/summary.rst
index fcf10d1..fcf10d1 100644
--- a/docs/requirements/summary.rst
+++ b/docs/development/requirements/summary.rst
diff --git a/docs/requirements/supported_apis.rst b/docs/development/requirements/supported_apis.rst
index 40cba8d..40cba8d 100644
--- a/docs/requirements/supported_apis.rst
+++ b/docs/development/requirements/supported_apis.rst
diff --git a/docs/requirements/usecase.rst b/docs/development/requirements/usecase.rst
index bdf8888..bdf8888 100644
--- a/docs/requirements/usecase.rst
+++ b/docs/development/requirements/usecase.rst
diff --git a/docs/installationprocedure/feature.configuration.rst b/docs/release/configguide/feature.configuration.rst
index 10696e0..10696e0 100644
--- a/docs/installationprocedure/feature.configuration.rst
+++ b/docs/release/configguide/feature.configuration.rst
diff --git a/docs/installationprocedure/images/LICENSE b/docs/release/configguide/images/LICENSE
index 6a84dd4..6a84dd4 100644
--- a/docs/installationprocedure/images/LICENSE
+++ b/docs/release/configguide/images/LICENSE
diff --git a/docs/installationprocedure/images/screenshot_promise.png b/docs/release/configguide/images/screenshot_promise.png
index 4a0cbe3..4a0cbe3 100755
--- a/docs/installationprocedure/images/screenshot_promise.png
+++ b/docs/release/configguide/images/screenshot_promise.png
diff --git a/docs/installationprocedure/images/screenshot_promise_install.png b/docs/release/configguide/images/screenshot_promise_install.png
index 2cb27d9..2cb27d9 100644
--- a/docs/installationprocedure/images/screenshot_promise_install.png
+++ b/docs/release/configguide/images/screenshot_promise_install.png
diff --git a/docs/installationprocedure/index.rst b/docs/release/configguide/index.rst
index 41bc079..41bc079 100644
--- a/docs/installationprocedure/index.rst
+++ b/docs/release/configguide/index.rst
diff --git a/docs/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index 5fcae54..0a32270 100644
--- a/docs/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@ -6,7 +6,7 @@ Abstract
 This user guide document provides the users with:
 
 1. Short description of Promise project and key features implemented in
-Colorado.
+Danube.
 
 Promise description
 ===================
@@ -22,7 +22,7 @@ The following are the key features provided by this module:
 
 Promise capabilities and usage
 ==============================
-The Colorado implementation of Promise is built with the YangForge data modeling
+The Danube implementation of Promise is built with the YangForge data modeling
 framework [#f2]_ , using a shim-layer on top of OpenStack to provide
 the Promise features. This approach requires communication between
 Consumers/Administrators and OpenStack to pass through the shim-layer. The
@@ -41,7 +41,7 @@ in the Promise requirement document [#f1]_ .
 
 Promise features and API usage guidelines and examples
 ------------------------------------------------------
-This section lists the Promise features and API implemented in OPNFV Colorado.
+This section lists the Promise features and API implemented in OPNFV Danube.
 
 Note: The listed parameters are optional unless explicitly marked as "mandatory".
 
@@ -156,7 +156,7 @@ The operation takes the following input parameters:
 * provider-id: identifier of the provider where the instance shall be created
 * reservation-id: identifier of a resource reservation the *create-instance*
 
-The Colorado implementation of Promise has the following limitations:
+The Danube implementation of Promise has the following limitations:
 
 * All create server instance requests shall pass through the Promise
   shim-layer such that Promise can keep track of all allocation requests. This
@@ -263,7 +263,7 @@ The current implementation supports the following filter criteria:
 
 This API  towards OpenStack allows a Consumer/Administrator to add and remove
 resource providers to Promise. Note, Promise supports a multi-provider
-configuration, however, for Colorado, multi-provider support is not yet
+configuration, however, for Danube, multi-provider support is not yet
 fully supported.
 
 *add-provider*
@@ -272,7 +272,7 @@ fully supported.
 This operation is used to register a new resource provider into the Promise
 reservation system.
 
-Note, for Colorado, the add-provider operation should only be used to
+Note, for Danube, the add-provider operation should only be used to
 register one provider with the Promise shim-layer. Further note that currently
 only OpenStack is supported as a provider.
 
diff --git a/docs/userguide/index.rst b/docs/release/userguide/index.rst
index f6cb21c..f6cb21c 100644
--- a/docs/userguide/index.rst
+++ b/docs/release/userguide/index.rst