Merge "Updating composite docs with links, information and versions."

1 files changed, 13 insertions, 30 deletions

diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index bacedb76d..e31c5b1ee 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -10,12 +10,12 @@ Abstract
 ========
 
 The following document provides an overview of the instructions required for the installation
-of the Colorado release of OPNFV.
+of the Danube release of OPNFV.
 
-The Colorado release can be installed using a tool from the following
-integration projects participating in OPNFV: Apex, Compass4Nfv, Fuel and JOID.
-Each installer provides the ability to install a common OPNFV platform as well as integrating
-additional features delivered through a variety of scenarios by the OPNFV community.
+The Danube release can be installed using a tool from the following integration projects in OPNFV:
+Apex, Compass4Nfv, Fuel and JOID.  Each installer provides the ability to install a common OPNFV
+platform as well as integrating additional features delivered through a variety of scenarios by
+the OPNFV community.
 
 
 Introduction
@@ -30,7 +30,7 @@ it is important to understand your required target platform capabilities before
 configuring your scenarios.
 
 An OPNFV installation requires either a physical, or virtual, infrastructure environment as defined
-in the `Pharos specification <http://artifacts.opnfv.org/pharos/colorado/2.0/docs/specification/index.html>`.
+in the `Pharos specification <https://wiki.opnfv.org/display/pharos/Pharos+Specification>`.
 When configuring a physical infrastructure it is strongly advised to follow the Pharos configuration guidelines.
 
 
@@ -44,25 +44,17 @@ solving specific problems for the deployment of VNF’s.
 A scenario may, for instance, include components such as OpenStack, OpenDaylight, OVS, KVM etc.,
 where each scenario will include different source components or configurations.
 
-To learn more about the scenarios supported in the Colorado release refer to the scenario
+To learn more about the scenarios supported in the Danube release refer to the scenario
 description documents provided:
 
-- Accelerated OVS `os-nosdn-ovs <http://artifacts.opnfv.org/ovsnfv/colorado/2.0/docs/scenarios_os-nosdn-ovs/index.html>`_
-- Layer 3 overlay using opendaylight `os-odl-l2-bgpvpn <http://artifacts.opnfv.org/sdnvpn/colorado/2.0/docs/scenarios_os-odl_l2-bgpvpn/index.html>`_
-- FD.io based forwarding using opendaylight SDN `os-odl-12-fdio-noha <http://artifacts.opnfv.org/fds/colorado/2.0/scenarios_os-odl_l2-fdio-noha/index.html>`_
-- High availability service function chaining `os-odl-l2-sfc-ha <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/scenarios_os-odl_l2-sfc-ha/index.html>`_
-- Service function chaining `os-odl-l2-sfc-noha <http://artifacts.opnfv.org/sfc/colorado/2.0/docs/scenarios_os-odl_l2-sfc-noha/index.html>`_
-- Accelerated KVM hypervisor `os-nosdn-kvm-ha <http://artifacts.opnfv.org/kvmfornfv/colorado/2.0/docs/scenarios_os-nosdn-kvm-ha/index.html>`_
-- LXD container hypervisor `os-nosdn-lxd-noha <http://artifacts.opnfv.org/joid/colorado/2.0/docs/scenarios_os-nosdn-lxd-noha/index.html>`_
-- High Availability LXD container hypervisor `os-nosdn-lxd-ha <http://artifacts.opnfv.org/joid/colorado/2.0/docs/scenarios_os-nosdn-lxd-ha/index.html>`_
-
+- Links to scenario description documents need to be added here.  (todo)
 
 Installation Procedure
 ======================
 
 Detailed step by step instructions for working with an installation toolchain and installing
 the required scenario are provided by each installation project.  The four projects providing installation
-support for the OPNFV Colorado release are; Apex, Compass4nfv, Fuel and Joid.
+support for the OPNFV Danube release are; Apex, Compass4nfv, Fuel and Joid.
 
 The instructions for each toolchain can be found in these links:
 
@@ -94,16 +86,7 @@ Many of the OPNFV test project provide user-guide documentation and installation
 Security Notes
 ==============
 
-The following patches were applied to fix security issues discovered in opnfv
-projects, during the Colorado release cycle.
-
-- `Removal of private keys <https://gerrit.opnfv.org/gerrit/#/c/21995/>`_
-- `Fix security issues of eval-s in testapi <https://gerrit.opnfv.org/gerrit/#/c/20751/>`_
-- `Implements use of yaml.safe_load <https://gerrit.opnfv.org/gerrit/#/c/20911/>`_
-- `Fix security issues reported by the security audit <https://gerrit.opnfv.org/gerrit/#/c/20693/>`_
-- `Fix issues found in security review <https://gerrit.opnfv.org/gerrit/#/c/21541/>`_
-- `Removing OpenSteak Project <https://gerrit.opnfv.org/gerrit/#/c/22139/>`_
-- `Remove unsed files in open-contrail role <https://gerrit.opnfv.org/gerrit/#/c/21997/>`_
-- `Get rid of private key in repo <https://gerrit.opnfv.org/gerrit/#/c/21985>`_
-- `Handling file loads and tmp dirs differently <https://gerrit.opnfv.org/gerrit/#/c/21499>`_
-- `Remove 'Debug = True' when run Flask and add logger <https://gerrit.opnfv.org/gerrit/#/c/21799/>`_
+The following patches were applied to fix security issues discovered in OPNFV
+projects, during the Danube release cycle.
+
+- Links to security patches need to be added here.  (todo)