diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 21f5e9ed5e..27237c0d20 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -8,10 +8,8 @@
 
 <para>
     This chapter provides procedures related to getting set up to use the
-    Yocto Project.
-    For a more front-to-end process that takes you from minimally preparing
-    a build host through building an image, see the
-    <ulink url='&YOCTO_DOCS_QS_URL;'>Yocto Project Quick Start</ulink>.
+    Yocto Project, working with Yocto Project source files, and building
+    an image.
 </para>
 
 <section id='setting-up-the-development-host-to-use-the-yocto-project'>
@@ -857,7 +855,7 @@
         information:
         <itemizedlist>
             <listitem><para>
-                <link linkend='var-BB_NUMBER_THREADS'><filename>BB_NUMBER_THREADS</filename>:</link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-BB_NUMBER_THREADS'><filename>BB_NUMBER_THREADS</filename>:</ulink>
                 The maximum number of threads BitBake simultaneously executes.
                 </para></listitem>
             <listitem><para>
@@ -865,18 +863,18 @@
                 The number of threads BitBake uses during parsing.
                 </para></listitem>
             <listitem><para>
-                <link linkend='var-PARALLEL_MAKE'><filename>PARALLEL_MAKE</filename>:</link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-PARALLEL_MAKE'><filename>PARALLEL_MAKE</filename>:</ulink>
                 Extra options passed to the <filename>make</filename> command
                 during the
-                <link linkend='ref-tasks-compile'><filename>do_compile</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#ref-tasks-compile'><filename>do_compile</filename></ulink>
                 task in order to specify parallel compilation on the
                 local build host.
                 </para></listitem>
             <listitem><para>
-                <link linkend='var-PARALLEL_MAKEINST'><filename>PARALLEL_MAKEINST</filename>:</link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-PARALLEL_MAKEINST'><filename>PARALLEL_MAKEINST</filename>:</ulink>
                 Extra options passed to the <filename>make</filename> command
                 during the
-                <link linkend='ref-tasks-install'><filename>do_install</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#ref-tasks-install'><filename>do_install</filename></ulink>
                 task in order to specify parallel installation on the
                 local build host.
                 </para></listitem>
@@ -923,7 +921,7 @@
                 </para></listitem>
             <listitem><para>
                 Using <filename>tmpfs</filename> for
-                <link linkend='var-TMPDIR'><filename>TMPDIR</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-TMPDIR'><filename>TMPDIR</filename></ulink>
                 as a temporary file system:
                 While this can help speed up the build, the benefits are
                 limited due to the compiler using
@@ -932,23 +930,24 @@
                 <filename>sync()</filename> calls into the
                 file system on the principle that if there was a significant
                 failure, the
-                <link linkend='build-directory'>Build Directory</link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>
                 contents could easily be rebuilt.
                 </para></listitem>
             <listitem><para>
                 Inheriting the
-                <link linkend='ref-classes-rm-work'><filename>rm_work</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-rm-work'><filename>rm_work</filename></ulink>
                 class:
                 Inheriting this class has shown to speed up builds due to
                 significantly lower amounts of data stored in the data
                 cache as well as on disk.
                 Inheriting this class also makes cleanup of
-                <link linkend='var-TMPDIR'><filename>TMPDIR</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-TMPDIR'><filename>TMPDIR</filename></ulink>
                 faster, at the expense of being easily able to dive into the
                 source code.
                 File system maintainers have recommended that the fastest way
                 to clean up large numbers of files is to reformat partitions
-                rather than delete files due to the linear nature of partitions.
+                rather than delete files due to the linear nature of
+                partitions.
                 This, of course, assumes you structure the disk partitions and
                 file systems in a way that this is practical.
                 </para></listitem>
@@ -958,7 +957,7 @@
         <itemizedlist>
             <listitem><para>
                 Remove items from
-                <link linkend='var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></ulink>
                 that you might not need.
                 </para></listitem>
             <listitem><para>
@@ -967,7 +966,7 @@
                 disabling the <filename>*-dbg</filename> package generation
                 can speed up the build.
                 You can disable this generation by setting the
-                <link linkend='var-INHIBIT_PACKAGE_DEBUG_SPLIT'><filename>INHIBIT_PACKAGE_DEBUG_SPLIT</filename></link>
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-INHIBIT_PACKAGE_DEBUG_SPLIT'><filename>INHIBIT_PACKAGE_DEBUG_SPLIT</filename></ulink>
                 variable to "1".
                 </para></listitem>
             <listitem><para>
@@ -1000,11 +999,6 @@
         </itemizedlist>
     </para>
 </section>
-
-
-
-
-
 </chapter>
 <!--
 vim: expandtab tw=80 ts=4
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index c784bd7424..334336880b 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -972,8 +972,8 @@
 
                 <para>
                     For more information on speeding up builds, see the
-                    "<link linkend='speeding-up-the-build'>Speeding Up the Build</link>"
-                    section.
+                    "<ulink url='&YOCTO_DOCS_DEV_URL;#speeding-up-the-build'>Speeding Up the Build</ulink>"
+                    section in the Yocto Project Development Tasks Manual.
                 </para>
             </glossdef>
         </glossentry>
@@ -10170,8 +10170,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
                 <para>
                     For more information on speeding up builds, see the
-                    "<link linkend='speeding-up-the-build'>Speeding Up the Build</link>"
-                    section.
+                    "<ulink url='&YOCTO_DOCS_DEV_URL;#speeding-up-the-build'>Speeding Up the Build</ulink>"
+                    section in the Yocto Project Development Tasks Manual.
                 </para>
             </glossdef>
         </glossentry>