4 files changed, 12 insertions, 12 deletions

diff --git a/documentation/toaster-manual/toaster-manual-intro.rst b/documentation/toaster-manual/toaster-manual-intro.rst
index ec50be5a91..bc4298dfce 100644
--- a/documentation/toaster-manual/toaster-manual-intro.rst
+++ b/documentation/toaster-manual/toaster-manual-intro.rst
@@ -4,8 +4,8 @@
 Introduction
 ************
 
-Toaster is a web interface to the Yocto Project's `OpenEmbedded build
-system <&YOCTO_DOCS_REF_URL;#build-system-term>`__. The interface
+Toaster is a web interface to the Yocto Project's
+:term:`OpenEmbedded Build System`. The interface
 enables you to configure and run your builds. Information about builds
 is collected and stored in a database. You can use Toaster to configure
 and start builds on multiple remote build servers.
diff --git a/documentation/toaster-manual/toaster-manual-reference.rst b/documentation/toaster-manual/toaster-manual-reference.rst
index c98a27eeb8..d799b4b99b 100644
--- a/documentation/toaster-manual/toaster-manual-reference.rst
+++ b/documentation/toaster-manual/toaster-manual-reference.rst
@@ -422,15 +422,15 @@ at the
 `Django <https://docs.djangoproject.com/en/1.7/topics/settings/>`__
 site. However, several ``manage.py`` commands have been created that are
 specific to Toaster and are used to control configuration and back-end
-tasks. You can locate these commands in the `Source
-Directory <&YOCTO_DOCS_REF_URL;#source-directory>`__ (e.g. ``poky``) at
+tasks. You can locate these commands in the
+:term:`Source Directory` (e.g. ``poky``) at
 ``bitbake/lib/manage.py``. This section documents those commands.
 
 .. note::
 
    -  When using ``manage.py`` commands given a default configuration,
-      you must be sure that your working directory is set to the `Build
-      Directory <&YOCTO_DOCS_REF_URL;#build-directory>`__. Using
+      you must be sure that your working directory is set to the
+      :term:`Build Directory`. Using
       ``manage.py`` commands from the Build Directory allows Toaster to
       find the ``toaster.sqlite`` file, which is located in the Build
       Directory.
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.rst b/documentation/toaster-manual/toaster-manual-setup-and-use.rst
index 7e715403d0..360270afbf 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.rst
+++ b/documentation/toaster-manual/toaster-manual-setup-and-use.rst
@@ -12,8 +12,8 @@ dependencies as described in the "`Preparing to Use
 Toaster <#toaster-manual-start>`__" chapter, you are ready to start
 Toaster.
 
-Navigate to the root of your `Source
-Directory <&YOCTO_DOCS_REF_URL;#source-directory>`__ (e.g. ``poky``): $
+Navigate to the root of your
+:term:`Source Directory` (e.g. ``poky``): $
 cd poky Once in that directory, source the build environment script: $
 source oe-init-build-env Next, from the build directory (e.g.
 ``poky/build``), start Toaster using this command: $ source toaster
@@ -267,8 +267,8 @@ Perform the following steps to install Toaster:
     the "`Configuring Toaster <#configuring-toaster>`__" section.
 
     This line also runs the ``checksettings`` command, which configures
-    the location of the Toaster `Build
-    Directory <&YOCTO_DOCS_REF_URL;#build-directory>`__. The Toaster
+    the location of the Toaster :term:`Build Directory`.
+    The Toaster
     root directory ``TOASTER_DIR`` determines where the Toaster build
     directory is created on the file system. In the example above,
     ``TOASTER_DIR`` is set as follows: /var/www/toaster/poky This
diff --git a/documentation/toaster-manual/toaster-manual-start.rst b/documentation/toaster-manual/toaster-manual-start.rst
index 439952e15e..1114c04eab 100644
--- a/documentation/toaster-manual/toaster-manual-start.rst
+++ b/documentation/toaster-manual/toaster-manual-start.rst
@@ -28,8 +28,8 @@ Establishing Toaster System Dependencies
 Toaster requires extra Python dependencies in order to run. A Toaster
 requirements file named ``toaster-requirements.txt`` defines the Python
 dependencies. The requirements file is located in the ``bitbake``
-directory, which is located in the root directory of the `Source
-Directory <&YOCTO_DOCS_REF_URL;#source-directory>`__ (e.g.
+directory, which is located in the root directory of the
+:term:`Source Directory` (e.g.
 ``poky/bitbake/toaster-requirements.txt``). The dependencies appear in a
 ``pip``, install-compatible format.