diff --git a/documentation/kernel-dev/kernel-dev-common.xml b/documentation/kernel-dev/kernel-dev-common.xml
index 17d89f7454..3b4428549d 100644
--- a/documentation/kernel-dev/kernel-dev-common.xml
+++ b/documentation/kernel-dev/kernel-dev-common.xml
@@ -26,14 +26,14 @@
             sure your build host is set up to use the Yocto Project.
             For information on how to get set up, see the
             "<ulink url='&YOCTO_DOCS_DEV_URL;#setting-up-the-development-host-to-use-the-yocto-project'>Setting Up to Use the Yocto Project</ulink>"
-            section in the Yocto Project Development Manual.
+            section in the Yocto Project Development Tasks Manual.
             Part of preparing the system is creating a local Git
             repository of the
             <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
             (<filename>poky</filename>) on your system.
             Follow the steps in the
             "<ulink url='&YOCTO_DOCS_DEV_URL;#cloning-the-poky-repository'>Cloning the <filename>poky</filename> Repository</ulink>"
-            section in the Yocto Project Development Manual to set up your
+            section in the Yocto Project Development Tasks Manual to set up your
             Source Directory.
             <note>
                 Be sure you check out the appropriate development branch or
@@ -43,7 +43,7 @@
                 "<ulink url='&YOCTO_DOCS_DEV_URL;#checking-out-by-branch-in-poky'>Checking Out by Branch in Poky</ulink>"
                 and
                 "<ulink url='&YOCTO_DOCS_DEV_URL;#checkout-out-by-tag-in-poky'>Checking Out by Tag in Poky</ulink>"
-                sections in the Yocto Project Development Manual for more
+                sections in the Yocto Project Development Tasks Manual for more
                 information.
             </note>
         </para>
@@ -132,15 +132,16 @@
                             For background information on working with
                             common and BSP layers, see the
                             "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
-                            section in the Yocto Project Development Manual
-                            and the
+                            section in the Yocto Project Development Tasks
+                            Manual and the
                             "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>"
                             section in the Yocto Project Board Support (BSP)
                             Developer's Guide, respectively.
                             For information on how to use the
                             <filename>yocto-layer</filename> script, see the
                             "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-general-layer-using-the-yocto-layer-script'>Creating a General Layer Using the yocto-layer Script</ulink>"
-                            section in the Yocto Project Development Manual.
+                            section in the Yocto Project Development Tasks
+                            Manual.
                         </note>
                         </para></listitem>
                     <listitem><para>
@@ -292,7 +293,7 @@
                         If you need to checkout out the &DISTRO_NAME; branch,
                         see the
                         "<ulink url='&YOCTO_DOCS_DEV_URL;#checking-out-by-branch-in-poky'>Checking out by Branch in Poky</ulink>"
-                        section in the Yocto Project Development Manual.
+                        section in the Yocto Project Development Tasks Manual.
                         <literallayout class='monospaced'>
      $ cd ~/poky
      $ git branch
@@ -356,15 +357,16 @@
                             For background information on working with
                             common and BSP layers, see the
                             "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
-                            section in the Yocto Project Development Manual
-                            and the
+                            section in the Yocto Project Development Tasks
+                            Manual and the
                             "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>"
                             section in the Yocto Project Board Support (BSP)
                             Developer's Guide, respectively.
                             For information on how to use the
                             <filename>yocto-layer</filename> script, see the
                             "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-general-layer-using-the-yocto-layer-script'>Creating a General Layer Using the yocto-layer Script</ulink>"
-                            section in the Yocto Project Development Manual.
+                            section in the Yocto Project Development Tasks
+                            Manual.
                         </note>
                         </para></listitem>
                     <listitem><para>
@@ -392,7 +394,7 @@
                         <para>
                         For simplicity, it is recommended that you create your
                         copy of the kernel Git repository outside of the
-                        <ulink url='&YOCTO_DOCS_REF_URL;source-directory'>Source Directory</ulink>,
+                        <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>,
                         which is usually named <filename>poky</filename>.
                         Also, be sure you are in the
                         <filename>standard/base</filename> branch.
@@ -428,7 +430,7 @@
                         Repository:</emphasis>
                         For simplicity, it is recommended that you create your
                         copy of the kernel cache Git repository outside of the
-                        <ulink url='&YOCTO_DOCS_REF_URL;source-directory'>Source Directory</ulink>,
+                        <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>,
                         which is usually named <filename>poky</filename>.
                         Also, for this example, be sure you are in the
                         <filename>yocto-4.12</filename> branch.
@@ -478,7 +480,7 @@
             patch files.
             For background information on working with layers, see the
             "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
-            section in the Yocto Project Development Manual.
+            section in the Yocto Project Development Tasks Manual.
             <note><title>Tip</title>
                 The Yocto Project comes with many tools that simplify
                 tasks you need to perform.
@@ -486,8 +488,8 @@
                 script, which simplifies creating a new layer.
                 See the
                 "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-general-layer-using-the-yocto-layer-script'>Creating a General Layer Using the yocto-layer Script</ulink>"
-                section in the Yocto Project Development Manual for information
-                on how to use this script.
+                section in the Yocto Project Development Tasks Manual for
+                information on how to use this script.
             </note>
         </para>
 
@@ -558,7 +560,7 @@
                     patch files.
                     For more information on using append files, see the
                     "<ulink url='&YOCTO_DOCS_DEV_URL;#using-bbappend-files'>Using .bbappend Files in Your Layer</ulink>"
-                    section in the Yocto Project Development Manual.
+                    section in the Yocto Project Development Tasks Manual.
                     </para></listitem>
             </orderedlist>
         </para>
@@ -573,7 +575,7 @@
             Each release of the Yocto Project provides a few Linux
             kernel recipes from which you can choose.
             These are located in the
-            <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
+            <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
             in <filename>meta/recipes-kernel/linux</filename>.
         </para>
 
@@ -694,7 +696,7 @@
                 variable could be used to enable features specific to
                 the kernel.
                 The append file points to specific commits in the
-                <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
+                <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
                 Git repository and the <filename>meta</filename> Git repository
                 branches to identify the exact kernel needed to build the
                 BSP.
@@ -1425,7 +1427,7 @@
                     sections.
                     You can also see the
                     "<ulink url='&YOCTO_DOCS_DEV_URL;#using-bbappend-files'>Using .bbappend Files in Your Layer"</ulink>"
-                    section in the Yocto Project Development Manual.
+                    section in the Yocto Project Development Tasks Manual.
                     <note>
                         To build <filename>core-image-minimal</filename>
                         again and see the effects of your patch, you can
diff --git a/documentation/kernel-dev/kernel-dev-faq.xml b/documentation/kernel-dev/kernel-dev-faq.xml
index b2cf2d4d0d..c3a20465a0 100644
--- a/documentation/kernel-dev/kernel-dev-faq.xml
+++ b/documentation/kernel-dev/kernel-dev-faq.xml
@@ -74,8 +74,9 @@
                         include "kernel-image".</para>
                         <para>See the
                         "<ulink url='&YOCTO_DOCS_DEV_URL;#using-bbappend-files'>Using .bbappend Files in Your Layer</ulink>"
-                        section in the Yocto Project Development Manual for information on
-                        how to use an append file to override metadata.
+                        section in the Yocto Project Development Tasks Manual
+                        for information on how to use an append file to
+                        override metadata.
                     </para>
                 </answer>
             </qandaentry>
diff --git a/documentation/kernel-dev/kernel-dev-intro.xml b/documentation/kernel-dev/kernel-dev-intro.xml
index 94b01593f1..88bc17a444 100644
--- a/documentation/kernel-dev/kernel-dev-intro.xml
+++ b/documentation/kernel-dev/kernel-dev-intro.xml
@@ -117,8 +117,8 @@
                 </para></listitem>
             <listitem><para>
                 The
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>" section
-                in the Yocto Project Development Manual
+                "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
+                section in the Yocto Project Development Tasks Manual.
                 </para></listitem>
             <listitem><para>
                 The