4 files changed, 18 insertions, 68 deletions
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index e31c5b1ee..74c24e6bf 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -1,3 +1,5 @@
+.. _opnfv-installation:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
 .. (c) Sofia Wallin Ericsson AB
@@ -73,15 +75,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/overview.rst b/docs/release/overview.rst
index 07a38c18a..594decf7d 100644
--- a/docs/release/overview.rst
+++ b/docs/release/overview.rst
@@ -1,3 +1,5 @@
+.. _opnfv-overview:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
 .. (c) Open Platform for NFV Project, Inc. and its contributors
@@ -112,7 +114,7 @@ an NFV domain, the OPNFV community consumes a sub-set of OpenStack projects wher
 composition may vary depending on the installer and scenario.
 
 For details on the scenarios available in OPNFV and the specific composition of components
-refer to the `OPNFV User Guide & Configuration Guide`_
+refer to the :ref:'OPNFV User Guide & Configuration Guide <opnfv-user-config>'
 
 -----------------
 Operating Systems
@@ -177,7 +179,7 @@ is provided by a virtual machine and allows control and workload placement using
 The initial deployment is done using a staging server, referred to as the "jumphost".
 This server-either physical or virtual-is first installed with the installation program
 that then installs OpenStack and other components on the controller nodes and compute nodes.
-See the `OPNFV User Guide`_ for more details.
+See the :ref:'OPNFV User Guide & Configuration Guide <opnfv-user-config>' for more details.
 
 
 The OPNFV Testing Ecosystem
diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst
index 24f6dc84d..3c84e7f9f 100644
--- a/docs/release/release-notes.rst
+++ b/docs/release/release-notes.rst
@@ -1,3 +1,5 @@
+.. _opnfv-releasenotes:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
@@ -14,88 +16,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:`KVMforNFV Release Notes <kvmfornfv-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/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index 18f349793..1a383cb2a 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -1,3 +1,5 @@
+.. _opnfv-user-config:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
 .. (c) Sofia Wallin (sofia.wallin@ericssion.com)