1 files changed, 9 insertions, 5 deletions

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 49d398aa38..0f8df85486 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -6243,7 +6243,7 @@
             (REST) API that queries for and returns build information using
             <filename>GET</filename> and <filename>JSON</filename>.
             These types of search operations retrieve sets of objects from
-            a data store used to collect build information.
+            a datastore used to collect build information.
             The results contain all the data for the objects being returned.
             You can order the results of the search by key and the search
             parameters are consistent for all object types.
@@ -6326,8 +6326,9 @@
                 <orderedlist>
                     <listitem><para><emphasis>Set up your build environment:</emphasis>
                         Source a build environment script (i.e.
-                        <filename>oe-init-build-env</filename> or
-                        <filename>oe-init-build-env-memres</filename>).
+                        <ulink url='&YOCTO_DOCS_REF_URL;#structure-core-script'><filename>&OE_INIT_FILE;</filename></ulink>
+                        or
+                        <ulink url='&YOCTO_DOCS_REF_URL;#structure-memres-core-script'><filename>oe-init-build-env-memres</filename></ulink>).
                         </para></listitem>
                     <listitem><para><emphasis>Prepare your local configuration file:</emphasis>
                         Toaster needs the Toaster class enabled
@@ -6338,7 +6339,9 @@
                         <literallayout class='monospaced'>
      INHERIT += "toaster"
                         </literallayout>
-                        Toaster also needs Build History enabled in Bitbake in
+                        Toaster also needs
+                        <ulink url='&YOCTO_DOCS_REF_URL;#maintaining-build-output-quality'>build history</ulink>
+                        enabled in Bitbake in
                         order to record target image package information.
                         You can enable this by adding the following two lines
                         to your <filename>conf/local.conf</filename> file:
@@ -6348,7 +6351,8 @@
                         </literallayout></para></listitem>
                     <listitem><para><emphasis>Start Toaster:</emphasis>
                         Start the Toaster service using this
-                        command from within your build directory:
+                        command from within your
+                        <link linkend='build-directory'>Build Directory</link>:
                         <literallayout class='monospaced'>
      $ source toaster start
                         </literallayout></para></listitem>