3 files changed, 42 insertions, 13 deletions

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 6c406dad53..425b05a03b 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1338,9 +1338,9 @@
         </para>
 
         <para>
-            For concepts on kernel configuration, see the
-            "<ulink url='&YOCTO_DOCS_KERNEL_URL;#kernel-configuration'>Kernel Configuration</ulink>"
-            section in the Yocto Project Kernel Architecture and Use Manual.
+            For more information on kernel configuration, see the
+            "<ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;#changing-the-configuration'>Changing the Configuration</ulink>"
+            section in the Yocto Project Linux Kernel Development Manual.
         </para>
 
         <section id='using-menuconfig'>
@@ -1622,6 +1622,12 @@
             in the Yocto Project Quick Start.
         </para>
 
+        <para>
+            Also, for more information on patching the kernel, see the
+            "<ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;#applying-patches'>Applying Patches</ulink>"
+            section in the Yocto Project Linux Kernel Development Manual.
+        </para>
+
         <section id='create-a-layer-for-your-changes'>
             <title>Create a Layer for your Changes</title>
 
@@ -2606,6 +2612,11 @@
             the most time in when doing X?"
             Because the OpenEmbedded build system is well integrated with OProfile, it makes profiling
             applications on target hardware straightforward.
+            <note>
+                For more information on how to set up and run OProfile, see the
+                "<ulink url='&YOCTO_DOCS_PROF_URL;#profile-manual-oprofile'>OProfile</ulink>"
+                section in the Yocto Project Profiling and Tracing Manual.
+            </note>
         </para>
 
         <para>
diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index dca24602ed..1086c778bd 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -103,9 +103,15 @@
                     This guide defines the structure for BSP components.
                     Having a commonly understood structure encourages standardization.</para></listitem>
                 <listitem><para><emphasis>
-                    <ulink url='&YOCTO_DOCS_KERNEL_URL;'>Yocto Project Kernel Architecture and Use Manual</ulink>:</emphasis>
-                    This manual describes the architecture of the Yocto Project kernel and provides
-                    some work flow examples.</para></listitem>
+                    <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel Development Manual</ulink>:</emphasis>
+                    This manual describes how to work with Linux Yocto kernels as well as providing a bit
+                    of conceptual information on the construction of the Yocto Linux kernel tree.
+                    </para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='&YOCTO_DOCS_PROF_URL;'>Yocto Project Profiling and Tracing Manual</ulink>:</emphasis>
+                    This manual presents a set of common and generally useful tracing and
+                    profiling schemes along with their application (as appropriate) to each tool.
+                    </para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
                     Eclipse IDE Yocto Plug-in</ulink>:</emphasis> A step-by-step instructional video that
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 442cab3036..0694682c90 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -17,6 +17,9 @@
              For an example on how to create a BSP, see the
              "<ulink url='&YOCTO_DOCS_BSP_URL;#creating-a-new-bsp-layer-using-the-yocto-bsp-script'>Creating a New BSP Layer Using the yocto-bsp Script</ulink>"
              section in the Yocto Project Board Support Package (BSP) Developer's Guide.
+             For more complete information on how to work with the kernel, see the
+             <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel
+             Development Manual</ulink>.
              </para></listitem>
          <listitem><para><emphasis>User Application Development:</emphasis>
              User Application Development covers development of applications that you intend
@@ -230,13 +233,13 @@
         <para>
             The remainder of this section presents a high-level overview of the Yocto Project
             kernel architecture and the steps to modify the kernel.
-            For a complete discussion of the kernel, see the
-            <ulink url='&YOCTO_DOCS_KERNEL_URL;'>Yocto Project Kernel Architecture and Use Manual</ulink>.
             You can reference the
             "<link linkend='patching-the-kernel'>Patching the Kernel</link>" section
             for an example that changes the source code of the kernel.
             For information on how to configure the kernel, see the
             "<link linkend='configuring-the-kernel'>Configuring the Kernel</link>" section.
+            For more information on the kernel and on modifying the kernel, see the
+            <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel Development Manual</ulink>.
         </para>
 
         <section id='kernel-overview'>
@@ -366,9 +369,9 @@
             </para>
 
             <para>
-                Again, for a complete discussion of the Yocto Project kernel's architecture and its
-                branching strategy, see the
-                <ulink url='&YOCTO_DOCS_KERNEL_URL;'>Yocto Project Kernel Architecture and Use Manual</ulink>.
+                Again, for additional information the Yocto Project kernel's
+                architecture and its branching strategy, see the
+                <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel Development Manual</ulink>.
                 You can also reference the
                 "<link linkend='patching-the-kernel'>Patching the Kernel</link>"
                 section for a detailed example that modifies the kernel.
@@ -1272,7 +1275,11 @@ directory.</para></listitem>
                         host can use, you must have <filename>oprofile</filename> version 0.9.4 or
                         greater installed on the host.</para>
                         <para>You can locate both the viewer and server from
-                        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/oprofileui/'></ulink>.
+                        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/oprofileui/'></ulink>
+                        You can also find more information on setting up and
+                        using this tool in the
+                        "<ulink url='&YOCTO_DOCS_PROF_URL;#profile-manual-oprofile'>OProfile</ulink>"
+                        section of the Yocto Project Profiling and Tracing Manual.
                         <note>The <filename>oprofile-server</filename> is installed by default on
                         the <filename>core-image-sato-sdk</filename> image.</note></para></listitem>
                     <listitem><para><emphasis><filename>Lttng2.0 ust trace import</filename>:</emphasis>
@@ -1331,7 +1338,12 @@ directory.</para></listitem>
                         performance counter registers.
                         Selecting either of these tools causes an RSE terminal view to appear
                         from which you can run the tools.
-                        Both tools refresh the entire screen to display results while they run.</para></listitem>
+                        Both tools refresh the entire screen to display results while they run.
+                        For more informationi on setting up and using <filename>perf</filename>,
+                        see the
+                        "<ulink url='&YOCTO_DOCS_PROF_URL;#profile-manual-perf'>perf</ulink>"
+                        section in the Yocto Project Profiling and Tracing Manual.
+                        </para></listitem>
                 </itemizedlist>
             </para>
         </section>