4 files changed, 10 insertions, 74 deletions
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index e31c5b1ee..4243fc707 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -73,15 +73,7 @@ The basic deployment validation only addresses a small part of capabilities prov
 the platform and you may want to execute more exhaustive tests.  Some investigation will be required to
 select the right test suites to run on your platform.
 
-Many of the OPNFV test project provide user-guide documentation and installation instructions as listed below:
-
-- :ref:`Functest user guide <functest-userguide>`
-- :ref:`Yardstick user guide <yardstick-userguidde>`
-- :ref:`vSwitchPerf user guide <vswitchperf-userguide>`
-- :ref:`Software Fastpath Service Quality Metrics (SFQM) user guide <fastpathmetrics-userguide>`
-- :ref:`Bottlenecks user guide <bottlenecks-userguide>`
-- :ref:`Storage Performance Benchmarking for NFVI (StorPerf) user guide <storperf-userguide>`
-
+Many of the OPNFV test project provide user-guide documentation and installation instructions in :ref:`this document <testing-userguide>`
 
 Security Notes
 ==============
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 24f6dc84d..eab8aec17 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -14,88 +14,38 @@ Project release notes:
 
 :ref:`Apex Release Notes <apex-releasenotes>`
 
-:ref:`Armband Release Notes <armband-releasenotes>`
+:ref:`Armband Release Notes <armband-release-notes-label>`
 
 :ref:`Bottlenecks Release Notes <bottlenecks-releasenotes>`
 
 :ref:`Compass4nfv Release Notes <compass4nfv-releasenotes>`
 
-:ref:`Conductor Release Notes <conductor-releasenotes>`
-
 :ref:`Copper Release Notes <copper-releasenotes>`
 
-:ref:`Daisy Release Notes <daisy-releasenotes>`
-
 :ref:`Doctor Release Notes <doctor-releasenotes>`
 
 :ref:`Domino Release Notes <domino-releasenotes>`
 
-:ref:`Dovetail Release Notes <dovetail-releasenotes>`
-
-:ref:`Dpacc Release Notes <dpacc-releasenotes>`
-
-:ref:`Enfv Release Notes <enfv-releasenotes>`
-
-:ref:`Escalator Release Notes <escalator-releasenotes>`
-
-:ref:`Fastpathmetrics Release Notes <fastpathmetrics-releasenotes>`
-
-:ref:`Fds Release Notes <fds-releasenotes>`
-
-:ref:`Fuel Release Notes <fuel-releasenotes>`
+:ref:`FDS Release Notes <fds-releasenotes>`
 
 :ref:`Functest Release Notes <functest-releasenotes>`
 
-:ref:`Genesisreq Release Notes <genesisreq-releasenotes>`
-
-:ref:`Inspector Release Notes <inspector-releasenotes>`
-
-:ref:`Ipv6 Release Notes <ipv6-releasenotes>`
+:ref:`IPV6 Release Notes <ipv6-releasenotes>`
 
 :ref:`Joid Release Notes <joid-releasenotes>`
 
-:ref:`Kvmfornfv Release Notes <kvmfornfv-releasenotes>`
-
-:ref:`Lsoapi Release Notes <lsoapi-releasenotes>`
-
-:ref:`Moon Release Notes <moon-releasenotes>`
+:ref:`KVM4NFV Release Notes <kvm4nfv-releasenotes>`
 
 :ref:`Multisite Release Notes <multisite-releasenotes>`
 
 :ref:`Netready Release Notes <netready-releasenotes>`
 
-:ref:`Octopus Release Notes <octopus-releasenotes>`
-
-:ref:`Onosfw Release Notes <onosfw-releasenotes>`
-
-:ref:`Ovsnfv Release Notes <ovsnfv-releasenotes>`
+:ref:`Opera Release Notes <opera-releasenotes>`
 
 :ref:`Parser Release Notes <parser-releasenotes>`
 
-:ref:`Pharos Release Notes <pharos-releasenotes>`
-
-:ref:`Prediction Release Notes <prediction-releasenotes>`
-
-:ref:`Promise Release Notes <promise-releasenotes>`
-
 :ref:`QTIP Release Notes <qtip-releasenotes>`
 
-:ref:`Releng Release Notes <releng-releasenotes>`
-
-:ref:`Sdnvpn Release Notes <sdnvpn-releasenotes>`
-
-:ref:`Sfc Release Notes <sfc-releasenotes>`
-
-:ref:`Storperf Release Notes <storperf-releasenotes>`
-
-:ref:`Ves Release Notes <ves-releasenotes>`
-
-:ref:`Vnf_Forwarding_Graph Release Notes <vnf_forwarding_graph-releasenotes>`
-
-:ref:`VSPERF Release Notes <vswitchperf-releasenotes>`
-
-:ref:`Yardstick Release Notes <yardstick-releasenotes>`
-
-:ref:`Ovno Release Notes <ovno-releasenotes>`
+:ref:`SFC Release Notes <sfc-releasenotes>`
 
-:ref:`Snaps Release Notes <snaps-releasenotes>`
+:ref:`VSPERF Release Notes <vsperf-releasenotes>`
diff --git a/docs/testing/testing-dev.rst b/docs/testing/testing-dev.rst
index 970abe2ae..74d4dbbd3 100644
--- a/docs/testing/testing-dev.rst
+++ b/docs/testing/testing-dev.rst
@@ -21,14 +21,6 @@ Bottlenecks
    ../submodules/bottlenecks/docs/testing/developer/devguide/index
 
 
-Yardstick
-----------
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/yardstick/docs/testing/developer/devguide/index
-
-
 QTIP
 -----
 .. toctree::
diff --git a/docs/testing/testing-user.rst b/docs/testing/testing-user.rst
index 8e69a482d..98159727b 100644
--- a/docs/testing/testing-user.rst
+++ b/docs/testing/testing-user.rst
@@ -1,3 +1,5 @@
+.. _testing-userguide:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0