5 files changed, 11 insertions, 11 deletions

diff --git a/documentation/overview-manual/overview-manual-yp-intro.rst b/documentation/overview-manual/overview-manual-yp-intro.rst
index 637d57abb9..d6488c6211 100644
--- a/documentation/overview-manual/overview-manual-yp-intro.rst
+++ b/documentation/overview-manual/overview-manual-yp-intro.rst
@@ -392,7 +392,7 @@ activities using the Yocto Project:
    benefit of the development community.
 
    You can learn more about the AutoBuilder used by the Yocto Project
-   Autobuilder :doc:`here </test-manual/test-manual-understand-autobuilder>`.
+   Autobuilder :doc:`here </test-manual/understand-autobuilder>`.
 
 -  *Cross-Prelink:* Prelinking is the process of pre-computing the load
    addresses and link tables generated by the dynamic linker as compared
diff --git a/documentation/test-manual/index.rst b/documentation/test-manual/index.rst
index 2891f06d81..e2198c4c39 100644
--- a/documentation/test-manual/index.rst
+++ b/documentation/test-manual/index.rst
@@ -10,9 +10,9 @@ Yocto Project Test Environment Manual
    :caption: Table of Contents
    :numbered:
 
-   test-manual-intro
-   test-manual-test-process
-   test-manual-understand-autobuilder
+   intro
+   test-process
+   understand-autobuilder
    history
 
 .. include:: /boilerplate.rst
diff --git a/documentation/test-manual/test-manual-intro.rst b/documentation/test-manual/intro.rst
index b41972084b..6168ad7700 100644
--- a/documentation/test-manual/test-manual-intro.rst
+++ b/documentation/test-manual/intro.rst
@@ -310,7 +310,7 @@ Test Examples
 =============
 
 This section provides example tests for each of the tests listed in the
-:ref:`test-manual/test-manual-intro:How Tests Map to Areas of Code` section.
+:ref:`test-manual/intro:How Tests Map to Areas of Code` section.
 
 For oeqa tests, testcases for each area reside in the main test
 directory at ``meta/lib/oeqa/selftest/cases`` directory.
diff --git a/documentation/test-manual/test-manual-test-process.rst b/documentation/test-manual/test-process.rst
index 8a5e29d922..8a5e29d922 100644
--- a/documentation/test-manual/test-manual-test-process.rst
+++ b/documentation/test-manual/test-process.rst
diff --git a/documentation/test-manual/test-manual-understand-autobuilder.rst b/documentation/test-manual/understand-autobuilder.rst
index ca0c5fd2e0..199cc97a85 100644
--- a/documentation/test-manual/test-manual-understand-autobuilder.rst
+++ b/documentation/test-manual/understand-autobuilder.rst
@@ -84,7 +84,7 @@ roughly consist of:
 
    This cleans out any previous build. Old builds are left around to
    allow easier debugging of failed builds. For additional information,
-   see :ref:`test-manual/test-manual-understand-autobuilder:clobberdir`.
+   see :ref:`test-manual/understand-autobuilder:clobberdir`.
 
 #. *Obtain yocto-autobuilder-helper*
 
@@ -108,7 +108,7 @@ roughly consist of:
    from the ``layerinfo.json`` file to help understand the
    configuration. It will also use a local cache of repositories to
    speed up the clone checkouts. For additional information, see
-   :ref:`test-manual/test-manual-understand-autobuilder:Autobuilder Clone Cache`.
+   :ref:`test-manual/understand-autobuilder:Autobuilder Clone Cache`.
 
    This step has two possible modes of operation. If the build is part
    of a parent build, its possible that all the repositories needed may
@@ -147,7 +147,7 @@ special script that moves files to a special location, rather than
 deleting them. Files in this location are deleted by an ``rm`` command,
 which is run under ``ionice -c 3``. For example, the deletion only
 happens when there is idle IO capacity on the Worker. The Autobuilder
-Worker Janitor runs this deletion. See :ref:`test-manual/test-manual-understand-autobuilder:Autobuilder Worker Janitor`.
+Worker Janitor runs this deletion. See :ref:`test-manual/understand-autobuilder:Autobuilder Worker Janitor`.
 
 Autobuilder Clone Cache
 -----------------------
@@ -157,13 +157,13 @@ on the Autobuilder. We therefore have a stash of commonly used
 repositories pre-cloned on the Workers. Data is fetched from these
 during clones first, then "topped up" with later revisions from any
 upstream when necessary. The cache is maintained by the Autobuilder
-Worker Janitor. See :ref:`test-manual/test-manual-understand-autobuilder:Autobuilder Worker Janitor`.
+Worker Janitor. See :ref:`test-manual/understand-autobuilder:Autobuilder Worker Janitor`.
 
 Autobuilder Worker Janitor
 --------------------------
 
 This is a process running on each Worker that performs two basic
-operations, including background file deletion at IO idle (see :ref:`test-manual/test-manual-understand-autobuilder:Autobuilder Target Execution Overview`: Run clobberdir) and
+operations, including background file deletion at IO idle (see :ref:`test-manual/understand-autobuilder:Autobuilder Target Execution Overview`: Run clobberdir) and
 maintainenance of a cache of cloned repositories to improve the speed
 the system can checkout repositories.
 
@@ -243,7 +243,7 @@ of post-build steps, including:
    generated to the remote server.
 
 #. Cleanup the build directory using
-   :ref:`test-manual/test-manual-understand-autobuilder:clobberdir` if the build was successful,
+   :ref:`test-manual/understand-autobuilder:clobberdir` if the build was successful,
    else rename it to "build-renamed" for potential future debugging.
 
 Deploying Yocto Autobuilder