summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/installation.introduction.rst5
-rw-r--r--docs/release/release-notes.rst6
-rw-r--r--docs/release/userguide.introduction.rst2
-rw-r--r--docs/testing/testing-dev.rst8
-rw-r--r--docs/testing/testing-user.rst9
5 files changed, 2 insertions, 28 deletions
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index b994ad0ee..a0de10440 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -14,7 +14,7 @@ Abstract
This an overview document for the installation of the Fraser release of OPNFV.
The Fraser release can be installed making use of any of the installer projects in OPNFV:
-Apex, Compass4Nfv, Daisy4NFV, Fuel or JOID. Each installer provides the ability to install a common OPNFV
+Apex, Compass4Nfv, Fuel or 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.
@@ -74,13 +74,12 @@ Installation Procedure
Detailed step by step instructions for working with an installation toolchain and installing
the required scenario are provided by the installation projects. The projects providing installation
-support for the OPNFV Fraser release are: Apex, Compass4nfv, Daisy4NFV, Fuel and JOID.
+support for the OPNFV Fraser release are: Apex, Compass4nfv, Fuel and JOID.
The instructions for each toolchain can be found in these links:
- :ref:`Apex installation instruction <apex-installation>`
- :ref:`Compass4nfv installation instruction <compass4nfv-installation>`
-- :ref:`Daisy installation instruction <daisy-installation>`
- :ref:`Fuel installation instruction <fuel-installation>`
- :ref:`JOID installation instruction <joid-installation>`
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 17ac1893f..ab706dd2c 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -26,8 +26,6 @@ Project release notes:
:ref:`Compass4nfv Release Notes <compass4nfv-releasenotes>`
-:ref:`Daisy Release Notes <daisy-releasenotes>`
-
:ref:`Doctor Release Notes <doctor-releasenotes>`
:ref:`FDS Release Notes <fds-releasenotes>`
@@ -46,10 +44,6 @@ Project release notes:
:ref:`OVN4NFV Release Notes <ovn4nfv-releasenotes>`
-:ref:`Parser Release Notes <parser-releasenotes>`
-
-:ref:`QTIP Release Notes <qtip-releasenotes>`
-
:ref:`SampleVNF Release Notes <samplevnf-releasenotes>`
:ref:`SDNVPN Release Notes <sdnvpn-releasenotes>`
diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 337bf6730..15a15c5f1 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -64,7 +64,6 @@ Feature Configuration Guides
- :ref:`IPv6 Configuration Guide <ipv6-configguide>`
- :ref:`Netready Configuration Guide <netready-configguide>`
- :ref:`Orchestra Configuration Guide <orchestra-configguide>`
-- :ref:`Parser Configuration Guide <parser-configguide>`
- :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>`
- :ref:`SFC Configuration Guide <sfc-configguide>`
@@ -78,7 +77,6 @@ Feature User Guides
- :ref:`IPv6 User Guide <ipv6-userguide>`
- :ref:`OpenContrail Virtual Networking User Guide <ovno-userguide>`
- :ref:`Orchestra User Guide <orchestra-userguide>`
-- :ref:`Parser User Guide <parser-userguide>`
- :ref:`SDNVPN User Guide <sdnvpn-userguide>`
- :ref:`SFC User Guide <sfc-userguide>`
diff --git a/docs/testing/testing-dev.rst b/docs/testing/testing-dev.rst
index f95cabca7..fdefb568e 100644
--- a/docs/testing/testing-dev.rst
+++ b/docs/testing/testing-dev.rst
@@ -38,14 +38,6 @@ StorPerf
../submodules/storperf/docs/testing/developer/devguide/index
-QTIP
------
-.. toctree::
- :maxdepth: 1
-
- ../submodules/qtip/docs/testing/developer/devguide/index
-
-
VSPERF
-------
.. toctree::
diff --git a/docs/testing/testing-user.rst b/docs/testing/testing-user.rst
index c7c4709c6..ca1b1c263 100644
--- a/docs/testing/testing-user.rst
+++ b/docs/testing/testing-user.rst
@@ -35,15 +35,6 @@ NFVbench
../submodules/nfvbench/docs/testing/user/userguide/index
-QTIP
------
-.. toctree::
- :maxdepth: 1
-
- ../submodules/qtip/docs/testing/user/configguide/index
- ../submodules/qtip/docs/testing/user/userguide/index
-
-
Storperf
--------