summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-11-10 06:57:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-10 06:57:37 +0000
commitd769327129cfc5f1a93e8f97ac8ed1fd92532015 (patch)
treed1742b47a270a719395299dd36617315ac5b0620
parentae60f0fbe962487253e2a0c4dff7e57ec99b55d6 (diff)
parent28ca02a291cff6c98fb44b96b402a1b7c04250ac (diff)
Merge "Final update" into stable/gambia
-rw-r--r--docs/release/installation.introduction.rst4
-rw-r--r--docs/release/release-notes.rst2
2 files changed, 1 insertions, 5 deletions
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index e4e1f690f..18b7d2d80 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -45,15 +45,13 @@ 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 Fraser release refer to the scenario
+To learn more about the scenarios supported in the Gabmia release refer to the scenario
description documents provided:
- :ref:`k8-nosdn-stor4nfv-ha <stor4nfv:k8-nosdn-stor4nfv-ha>`
- :ref:`os-nosdn-bar-ha <os-nosdn-bar-ha>`
- :ref:`os-nosdn-stor4nfv-ha <os-nosdn-stor4nfv-ha>`
-- :ref:`os-nosdn-calipso-noha <os-nosdn-calipso-noha>`
- :ref:`os-nosdn-ovs-noha <os-nosdn-ovs-noha>`
-- :ref:`os-nosdn-ovs-ha <os-nosdn-ovs-ha>`
- :ref:`os-nosdn-vpp-noha <os-nosdn-vpp-noha>`
- :ref:`os-nosdn-vpp-ha <os-nosdn-vpp-ha>`
- :ref:`os-odl-ovs-noha <os-odl-ovs-noha>`
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index d102382ff..691c6d270 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -28,8 +28,6 @@ Project release notes:
:ref:`Compass4nfv Release Notes <compass4nfv-releasenotes>`
-:ref:`Daisy4nfv Release Notes <daisy4nfv-releasenotes>`
-
:ref:`Doctor Release Notes <doctor-releasenotes>`
:ref:`FDS Release Notes <fds-releasenotes>`