Merge "Colorado 2.0 updates"

1 files changed, 68 insertions, 69 deletions

diff --git a/docs/documentation/index.rst b/docs/documentation/index.rst
index d885d8f5c..6f3ee54b8 100644
--- a/docs/documentation/index.rst
+++ b/docs/documentation/index.rst
@@ -16,21 +16,21 @@ more detailed installation instructions and descriptive documentation.
 Platform documentation
 ======================
 
-* `OPNFV platform overview document <http://artifacts.opnfv.org/opnfvdocs/colorado/docs/overview/index.html>`_
-* `OPNFV Installation instruction <http://artifacts.opnfv.org/opnfvdocs/colorado/docs/installationprocedure/index.html>`_
-* `OPNFV user guide <http://artifacts.opnfv.org/opnfvdocs/colorado/docs/userguide/index.html>`_
+* `OPNFV platform overview document <http://artifacts.opnfv.org/opnfvdocs/colorado/2.0/docs/overview/index.html>`_
+* `OPNFV Installation instruction <http://artifacts.opnfv.org/opnfvdocs/colorado/2.0/docs/installationprocedure/index.html>`_
+* `OPNFV user guide <http://artifacts.opnfv.org/opnfvdocs/colorado/2.0/docs/userguide/index.html>`_
 
 Installation instructions
 =========================
 
-* `Apex installation instruction <http://artifacts.opnfv.org/apex/colorado/docs/installationprocedure/index.html>`_
-* `Apex release notes <http://artifacts.opnfv.org/apex/colorado/docs/releasenotes/index.html>`_
-* `Compass installation instruction <http://artifacts.opnfv.org/compass4nfv/colorado/docs/installationprocedure/index.html>`_
-* `Compass release notes <http://artifacts.opnfv.org/compass4nfv/colorado/docs/releasenotes/index.html>`_
-* `Fuel installation instruction <http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html>`_
-* `Fuel release notes <http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html>`_
-* `Joid installation instruction <http://artifacts.opnfv.org/joid/colorado/docs/installationprocedure/index.html>`_
-* `Joid release notes <http://artifacts.opnfv.org/joid/colorado/docs/releasenotes/index.html>`_
+* `Apex installation instruction <http://artifacts.opnfv.org/apex/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Apex release notes <http://artifacts.opnfv.org/apex/colorado/2.0/docs/releasenotes/index.html>`_
+* `Compass installation instruction <http://artifacts.opnfv.org/compass4nfv/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Compass release notes <http://artifacts.opnfv.org/compass4nfv/colorado/2.0/docs/releasenotes/index.html>`_
+* `Fuel installation instruction <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Fuel release notes <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_
+* `Joid installation instruction <http://artifacts.opnfv.org/joid/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Joid release notes <http://artifacts.opnfv.org/joid/colorado/2.0/docs/releasenotes/index.html>`_
 
 Feature project documentation
 =============================
@@ -39,140 +39,139 @@ Feature project documentation
 ARMband project
 ---------------
 
-* `Installation instruction <http://artifacts.opnfv.org/armband/colorado/docs/installationprocedure/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/armband/colorado/docs/releasenotes/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/armband/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/armband/colorado/2.0/docs/releasenotes/index.html>`_
 
 ----------------------------------------------
 Copper release documentation
 ----------------------------------------------
 
-* `Design documentation <http://artifacts.opnfv.org/copper/colorado/docs/design/index.html>`_
-* `Installation instruction <http://artifacts.opnfv.org/copper/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/copper/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/copper/colorado/docs/releasenotes/index.html>`_
+* `Design documentation <http://artifacts.opnfv.org/copper/colorado/2.0/docs/design/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/copper/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/copper/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/copper/colorado/2.0/docs/releasenotes/index.html>`_
 
 -----------------------------------------------------
 Doctor features and capabilities
 -----------------------------------------------------
 
-* `Project overview <http://artifacts.opnfv.org/doctor/colorado/docs/platformoverview/index.html>`_
-* `User guide <http://artifacts.opnfv.org/doctor/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/doctor/colorado/docs/releasenotes/index.html>`_
+* `Project overview <http://artifacts.opnfv.org/doctor/colorado/2.0/docs/scenarios/index.html>`_
+* `User guide <http://artifacts.opnfv.org/doctor/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/doctor/colorado/2.0/docs/releasenotes/index.html>`_
 
 ----------------------------------------------------------------
 Domino features and capabilities
 ----------------------------------------------------------------
 
-* `User guide <http://artifacts.opnfv.org/domino/colorado/docs/userguide/index.html>`_
+* `User guide <http://artifacts.opnfv.org/domino/colorado/2.0/docs/userguide/index.html>`_
 
 -------------------------------------------------
 FastDataStacks feature and scenario documentation
 -------------------------------------------------
 
-* `OpenDaylight integrated fd.io scenario description <http://artifacts.opnfv.org/fds/colorado/scenarios_os-odl_l2-fdio-noha/index.html>`_
+* `OpenDaylight integrated fd.io scenario description <http://artifacts.opnfv.org/fds/colorado/2.0/scenarios_os-odl_l2-fdio-noha/index.html>`_
 
 ------------------------------------
 IPv6 platform support and capability
 ------------------------------------
 
-* `Configuration guide <http://artifacts.opnfv.org/ipv6/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/ipv6/colorado/docs/userguide/index.html>`_
+* `Configuration guide <http://artifacts.opnfv.org/ipv6/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/ipv6/colorado/2.0/docs/userguide/index.html>`_
 
 -----------
 KVM for NFV
 -----------
 
-* `Installation instruction <http://artifacts.opnfv.org/kvmfornfv/colorado/docs/installationprocedure/index.html>`_
-* `Configuration guide <http://artifacts.opnfv.org/kvmfornfv/colorado/docs/configurationguide/index.html>`_
-* `User guide <http://artifacts.opnfv.org/kvmfornfv/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/kvmfornfv/colorado/docs/releasenotes/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/kvmfornfv/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Configuration guide <http://artifacts.opnfv.org/kvmfornfv/colorado/2.0/docs/configurationguide/index.html>`_
+* `User guide <http://artifacts.opnfv.org/kvmfornfv/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/kvmfornfv/colorado/2.0/docs/releasenotes/index.html>`_
 
 --------------------------------
 MOON security management for NFV
 --------------------------------
 
-* `Project and Scenario overview <http://artifacts.opnfv.org/moon/colorado/docs/colorado_scenarios_os-odl_l2-moon-ha/index.html>`_
-* `Installation instruction <http://artifacts.opnfv.org/moon/colorado/docs/installationprocedure/index.html>`_
-* `Configuration guide <http://artifacts.opnfv.org/moon/colorado/docs/configurationguide/index.html>`_
-* `User guide <http://artifacts.opnfv.org/moon/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/moon/colorado/docs/releasenotes/index.html>`_
+* `Project and Scenario overview <http://artifacts.opnfv.org/moon/colorado/docs/scenarios_os-odl_l2-moon-ha/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/moon/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/moon/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/moon/colorado/2.0/docs/releasenotes/index.html>`_
 
 ----------------------------
 Multisite datacenter project
 ----------------------------
 
-* `Installation instruction <http://artifacts.opnfv.org/multisite/colorado/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/multisite/colorado/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/multisite/colorado/releasenotes/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/multisite/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/multisite/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/multisite/colorado/2.0/docs/releasenotes/index.html>`_
 
 -------------------------
 Network readiness project
 -------------------------
 
-* `Requirements document <http://artifacts.opnfv.org/netready/colorado/docs/requirements/index.html>`_
+* `Requirements document <http://artifacts.opnfv.org/netready/colorado/2.0/docs/requirements/index.html>`_
 
 ----------------------
 ONOS framework project
 ----------------------
 
-* `Installation instruction <http://artifacts.opnfv.org/onosfw/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/onosfw/colorado/docs/userguide/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/onosfw/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/onosfw/colorado/2.0/docs/userguide/index.html>`_
 
 ----------------------------
 OVSNFV release documentation
 ----------------------------
 
-* `OVS for NFV scenario description <http://artifacts.opnfv.org/ovsnfv/colorado/docs/scenarios_os-nosdn-ovs/index.html>`_
-* `Configuration guide <http://artifacts.opnfv.org/ovsnfv/colorado/docs/configguide/index.html>`_
-* `User guide <http://artifacts.opnfv.org/ovsnfv/colorado/docs/userguide/index.html>`_
+* `OVS for NFV scenario description <http://artifacts.opnfv.org/ovsnfv/colorado/2.0/docs/scenarios_os-nosdn-ovs/index.html>`_
+* `Configuration guide <http://artifacts.opnfv.org/ovsnfv/colorado/2.0/docs/configguide/index.html>`_
+* `User guide <http://artifacts.opnfv.org/ovsnfv/colorado/2.0/docs/userguide/index.html>`_
 
 --------------
 Parser project
 --------------
 
-* `Parser release documentation <http://artifacts.opnfv.org/parser/colorado/docs/parser_docs/index.html>`_
-* `Installation instruction <http://artifacts.opnfv.org/parser/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/parser/colorado/docs/userguide/index.html>`_
+* `Parser release documentation <http://artifacts.opnfv.org/parser/colorado/2.0/docs/parser_docs/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/parser/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/parser/colorado/2.0/docs/userguide/index.html>`_
 
 ------
 Pharos
 ------
 
-* `Pharos specification <http://artifacts.opnfv.org/pharos/colorado/docs/specification/index.html>`_
-* `Configuration guide <http://artifacts.opnfv.org/pharos/colorado/docs/configguide/index.html>`_
+* `Pharos specification <http://artifacts.opnfv.org/pharos/colorado/2.0/docs/specification/index.html>`_
+* `Configuration guide <http://artifacts.opnfv.org/pharos/colorado/2.0/docs/configguide/index.html>`_
 
 -------
 Promise
 -------
 
-* `Requirement specification <http://artifacts.opnfv.org/promise/colorado/docs/requirements/index.html>`_
-* `Installation and configuration guide <http://artifacts.opnfv.org/promise/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/promise/colorado/docs/userguide/index.html>`_
+* `Requirement specification <http://artifacts.opnfv.org/promise/colorado/2.0/docs/requirements/index.html>`_
+* `Installation and configuration guide <http://artifacts.opnfv.org/promise/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/promise/colorado/2.0/docs/userguide/index.html>`_
 
 ------
 SDNVPN
 ------
 
-* `BGPVPN scenario description <http://artifacts.opnfv.org/sdnvpn/colorado/docs/scenarios_os-odl_l2-bgpvpn/index.html>`_
-* `User guide <http://artifacts.opnfv.org/sdnvpn/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/sdnvpn/colorado/docs/release-notes/index.html>`_
+* `BGPVPN scenario description <http://artifacts.opnfv.org/sdnvpn/colorado/2.0/docs/scenarios_os-odl_l2-bgpvpn/index.html>`_
+* `User guide <http://artifacts.opnfv.org/sdnvpn/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/sdnvpn/colorado/2.0/docs/release-notes/index.html>`_
 
 ---
 SFC
 ---
 
-* `Design documentation <http://artifacts.opnfv.org/sfc/colorado/docs/design/index.html>`_
-* `SFC scenario description <http://artifacts.opnfv.org/sfc/colorado/docs/scenarios_os-odl_l2-sfc-noha/index.html>`_
-* `High availability SFC scenario description <http://artifacts.opnfv.org/sfc/colorado/docs/scenarios_os-odl_l2-sfc-ha/index.html>`_
-* `Installation instruction <http://artifacts.opnfv.org/sfc/colorado/docs/installationprocedure/index.html>`_
-* `User guide <http://artifacts.opnfv.org/sfc/colorado/docs/userguide/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/sfc/colorado/docs/releasenotes/index.html>`_
+* `Design documentation <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/design/index.html>`_
+* `SFC scenario description <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/scenarios_os-odl_l2-sfc-noha/index.html>`_
+* `High availability SFC scenario description <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/scenarios_os-odl_l2-sfc-ha/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/installationprocedure/index.html>`_
+* `User guide <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/userguide/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/releasenotes/index.html>`_
 
 ------------------------------------------------
 Software fast-path quality metrics documentation
 ------------------------------------------------
 
-* `Release and development documentation <http://artifacts.opnfv.org/fastpathmetrics/colorado/index.html>`_
+* `Release and development documentation <http://artifacts.opnfv.org/fastpathmetrics/colorado/2.0/index.html>`_
 
 
 Test Project documentation
@@ -182,28 +181,28 @@ Test Project documentation
 Bottlenecks documentation
 -------------------------
 
-* `Installation instruction <http://artifacts.opnfv.org/bottlenecks/colorado/docs/installationprocedure/index.html>`_
-* `Release notes <http://artifacts.opnfv.org/bottlenecks/docs/releasenotes/index.html>`_
+* `Installation instruction <http://artifacts.opnfv.org/bottlenecks/colorado/2.0/docs/installationprocedure/index.html>`_
+* `Release notes <http://artifacts.opnfv.org/bottlenecks/colorado/2.0/docs/releasenotes/index.html>`_
 
 ----------------------
 Functest documentation
 ----------------------
 
-*  `Configuration guide <http://artifacts.opnfv.org/functest/colorado/docs/configguide/index.html>`_
-*  `User guide <http://artifacts.opnfv.org/functest/colorado/docs/userguide/index.html>`_
-*  `Developer guide <http://artifacts.opnfv.org/functest/colorado/docs/devguide/index.html>`_
-*  `Release notes <http://artifacts.opnfv.org/functest/colorado/docs/release-notes/functest-release.html>`_
+*  `Configuration guide <http://artifacts.opnfv.org/functest/colorado/2.0/docs/configguide/index.html>`_
+*  `User guide <http://artifacts.opnfv.org/functest/colorado/2.0/docs/userguide/index.html>`_
+*  `Developer guide <http://artifacts.opnfv.org/functest/colorado/2.0/docs/devguide/index.html>`_
+*  `Release notes <http://artifacts.opnfv.org/functest/colorado/docs/release-notes/index.html>`_
 
 -------------------------
 vSwitchPerf documentation
 -------------------------
 
-* `Release and development documentation  <http://artifacts.opnfv.org/vswitchperf/colorado/docs/index.html>`_
+* `Release and development documentation  <http://artifacts.opnfv.org/vswitchperf/colorado/2.0/docs/index.html>`_
 
 -----------------------
 Yardstick documentation
 -----------------------
 
-*  `User guide <http://artifacts.opnfv.org/yardstick/colorado/docs/userguide/index.html>`_
-*  `Release notes <http://artifacts.opnfv.org/yardstick/colorado/docs/release/index.html>`_
+*  `User guide <http://artifacts.opnfv.org/yardstick/colorado/2.0/docs/userguide/index.html>`_
+*  `Release notes <http://artifacts.opnfv.org/yardstick/colorado/2.0/docs/release/index.html>`_