1 files changed, 47 insertions, 26 deletions

diff --git a/documentation/sdk-manual/sdk-using.rst b/documentation/sdk-manual/sdk-using.rst
index b240f9174a..cd57f07eeb 100644
--- a/documentation/sdk-manual/sdk-using.rst
+++ b/documentation/sdk-manual/sdk-using.rst
@@ -42,13 +42,12 @@ Structure <#sdk-installed-standard-sdk-directory-structure>`__" section.
 Installing the SDK
 ==================
 
-The first thing you need to do is install the SDK on your `Build
-Host <&YOCTO_DOCS_REF_URL;#hardware-build-system-term>`__ by running the
-``*.sh`` installation script.
+The first thing you need to do is install the SDK on your :term:`Build
+Host` by running the ``*.sh`` installation script.
 
 You can download a tarball installer, which includes the pre-built
 toolchain, the ``runqemu`` script, and support files from the
-appropriate `toolchain <&YOCTO_TOOLCHAIN_DL_URL;>`__ directory within
+appropriate :yocto_dl:`toolchain <releases/yocto/yocto-3.1.2/toolchain/>` directory within
 the Index of Releases. Toolchains are available for several 32-bit and
 64-bit architectures with the ``x86_64`` directories, respectively. The
 toolchains the Yocto Project provides are based off the
@@ -58,17 +57,33 @@ libraries appropriate for developing against that image.
 The names of the tarball installer scripts are such that a string
 representing the host system appears first in the filename and then is
 immediately followed by a string representing the target architecture.
-poky-glibc-host_system-image_type-arch-toolchain-release_version.sh
-Where: host_system is a string representing your development system:
-i686 or x86_64. image_type is the image for which the SDK was built:
-core-image-minimal or core-image-sato. arch is a string representing the
-tuned target architecture: aarch64, armv5e, core2-64, i586, mips32r2,
-mips64, ppc7400, or cortexa8hf-neon. release_version is a string
-representing the release number of the Yocto Project: DISTRO,
-DISTRO+snapshot For example, the following SDK installer is for a 64-bit
+::
+
+   poky-glibc-host_system-image_type-arch-toolchain-release_version.sh
+
+   Where:
+       host_system is a string representing your development system:
+
+                  i686 or x86_64.
+
+       image_type is the image for which the SDK was built:
+
+                  core-image-minimal or core-image-sato.
+
+       arch is a string representing the tuned target architecture:
+
+                  aarch64, armv5e, core2-64, i586, mips32r2, mips64, ppc7400, or cortexa8hf-neon.
+
+       release_version is a string representing the release number of the Yocto Project:
+
+                  3.1.2, 3.1.2+snapshot
+
+For example, the following SDK installer is for a 64-bit
 development host system and a i586-tuned target architecture based off
 the SDK for ``core-image-sato`` and using the current DISTRO snapshot:
-poky-glibc-x86_64-core-image-sato-i586-toolchain-DISTRO.sh
+::
+
+   poky-glibc-x86_64-core-image-sato-i586-toolchain-DISTRO.sh
 
 .. note::
 
@@ -96,16 +111,18 @@ architecture. The example assumes the SDK installer is located in
    that case, set up the proper permissions in the directory and run the
    installer again.
 
-$ ./Downloads/poky-glibc-x86_64-core-image-sato-i586-toolchain-DISTRO.sh
-Poky (Yocto Project Reference Distro) SDK installer version DISTRO
-=============================================================== Enter
-target directory for SDK (default: /opt/poky/DISTRO): You are about to
-install the SDK to "/opt/poky/DISTRO". Proceed [Y/n]? Y Extracting
-SDK........................................
-..............................done Setting it up...done SDK has been
-successfully set up and is ready to be used. Each time you wish to use
-the SDK in a new shell session, you need to source the environment setup
-script e.g. $ . /opt/poky/DISTRO/environment-setup-i586-poky-linux
+::
+
+   $ ./Downloads/poky-glibc-x86_64-core-image-sato-i586-toolchain-3.1.2.sh
+   Poky (Yocto Project Reference Distro) SDK installer version 3.1.2
+   ===============================================================
+   Enter target directory for SDK (default: /opt/poky/3.1.2):
+   You are about to install the SDK to "/opt/poky/3.1.2". Proceed [Y/n]? Y
+   Extracting SDK........................................ ..............................done
+   Setting it up...done
+   SDK has been successfully set up and is ready to be used.
+   Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g.
+    $ . /opt/poky/3.1.2/environment-setup-i586-poky-linux
 
 Again, reference the "`Installed Standard SDK Directory
 Structure <#sdk-installed-standard-sdk-directory-structure>`__" section
@@ -120,7 +137,7 @@ Running the SDK Environment Setup Script
 Once you have the SDK installed, you must run the SDK environment setup
 script before you can actually use the SDK. This setup script resides in
 the directory you chose when you installed the SDK, which is either the
-default ``/opt/poky/DISTRO`` directory or the directory you chose during
+default ``/opt/poky/3.1.2`` directory or the directory you chose during
 installation.
 
 Before running the script, be sure it is the one that matches the
@@ -129,8 +146,12 @@ begin with the string "``environment-setup``" and include as part of
 their name the tuned target architecture. As an example, the following
 commands set the working directory to where the SDK was installed and
 then source the environment setup script. In this example, the setup
-script is for an IA-based target machine using i586 tuning: $ source
-/opt/poky/DISTRO/environment-setup-i586-poky-linux When you run the
+script is for an IA-based target machine using i586 tuning:
+::
+
+   $ source /opt/poky/3.1.2/environment-setup-i586-poky-linux
+
+When you run the
 setup script, the same environment variables are defined as are when you
 run the setup script for an extensible SDK. See the "`Running the
 Extensible SDK Environment Setup