3 files changed, 15 insertions, 39 deletions
diff --git a/docs/release/subrelease.rst b/docs/release/subrelease.rst
index fa4bd95bb..2013377c8 100644
--- a/docs/release/subrelease.rst
+++ b/docs/release/subrelease.rst
@@ -4,38 +4,24 @@ Subrelease Guides
 
 Apex
 -----
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/apex/docs/releasenotes/index
-   ../submodules/apex/docs/installationprocedure/index
+* :ref:`Release Notes <apex:apex-releasenotes>`
+* :ref:`Installation <apex:apex-installation>`
 
 Compass
 --------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/compass4nfv/docs/releasenotes/index
-   ../submodules/compass4nfv/docs/installationprocedure/index
+* :ref:`Release Notes <compass4nfv:compass4nfv-releasenotes>`
+* :ref:`Installation <compass4nfv:compass4nfv-installation>`
 
 Daisy
 -------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/daisy/docs/release/release-notes/index
-   ../submodules/daisy/docs/release/installation/index
+* :ref:`Release Notes <daisy:daisy-releasenotes>`
+* :ref:`Installation <daisy:daisy-installation>`
 
 Fuel
 -----
 
-* :ref:`Release Notes <fuel:fuel-release-notes-label>`
+* :ref:`Release Notes <fuel:fuel-releasenotes>`
 * :ref:`Installation <fuel:fuel-installation>`
-
-Joid
------
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/joid/docs/releasenotes/index
-   ../submodules/joid/docs/installationprocedure/index
diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index f661ed335..1c7576b97 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -1,3 +1,5 @@
+.. _developer-devguide:
+
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) Christopher Price (Ericsson AB)
diff --git a/docs/testing/testing-dev.rst b/docs/testing/testing-dev.rst
index 291781455..566cb67be 100644
--- a/docs/testing/testing-dev.rst
+++ b/docs/testing/testing-dev.rst
@@ -16,46 +16,34 @@ Testing group
 
 Bottlenecks
 ------------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/bottlenecks/docs/testing/developer/devguide/index
+* :doc:`Bottlenecks Developer Guide <bottlenecks:testing/developer/devguide/index>`
 
 
 Dovetail / OPNFV Verified Program
 ---------------------------------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/dovetail/docs/testing/developer/testcaserequirements/index
+* :doc:`OVP Test Case Requirements <dovetail:testing/developer/testcaserequirements/index>`
 
 Functest
 ---------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/functest/docs/testing/developer/devguide/index
+* :doc:`Functest Developer Guide <functest:testing/developer/devguide/index>`
 
 
 StorPerf
 --------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/storperf/docs/testing/developer/devguide/index
+* :doc:`StorPerf Developer Guide <storperf:testing/developer/devguide/index>`
 
 
 VSPERF
 -------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/vswitchperf/docs/testing/developer/devguide/index
+* :doc:`VSPERF Developer Guide <vswitchperf:testing/developer/devguide/index>`
 
 
 Yardstick
 ---------
-.. toctree::
-   :maxdepth: 1
 
-   ../submodules/yardstick/docs/testing/developer/devguide/index
+* :doc:`Yardstick Developer Guide <yardstick:testing/developer/devguide/index>`