diff --git a/documentation/overview-manual/overview-manual-concepts.xml b/documentation/overview-manual/overview-manual-concepts.xml
index 5067e3f627..6f0b60e7a5 100644
--- a/documentation/overview-manual/overview-manual-concepts.xml
+++ b/documentation/overview-manual/overview-manual-concepts.xml
@@ -583,7 +583,7 @@
                 The layers appear at the bottom categorized under
                 "Yocto Metadata Layers."
                 These layers are fundamentally a subset of the
-                <ulink url="http://layers.openembedded.org/layerindex/layers/">OpenEmbedded Metadata Index</ulink>,
+                <ulink url="http://layers.openembedded.org/layerindex/layers/">OpenEmbedded Layer Index</ulink>,
                 which lists all layers provided by the OpenEmbedded community.
                 <note>
                     Layers exist in the Yocto Project Source Repositories that
@@ -826,13 +826,6 @@
                     recipe to point to the local directory on your disk to pull
                     in the whole source tree.
                 </para>
-
-                <para>
-                    For information on how to use the
-                    <filename>externalsrc</filename> class, see the
-                    "<ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-externalsrc'><filename>externalsrc.bbclass</filename></ulink>"
-                    section.
-                </para>
             </section>
 
             <section id='scms'>
diff --git a/documentation/overview-manual/overview-manual-development-environment.xml b/documentation/overview-manual/overview-manual-development-environment.xml
index f45dd1b39e..faad11e862 100644
--- a/documentation/overview-manual/overview-manual-development-environment.xml
+++ b/documentation/overview-manual/overview-manual-development-environment.xml
@@ -142,7 +142,7 @@
                 </para>
 
                 <para>The
-                <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Package (BSP) Developer's Guide'</ulink>
+                <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Package (BSP) Developer's Guide</ulink>
                 provides BSP-related development information.
                 For specifics on development host preparation, see the
                 "<ulink url='&YOCTO_DOCS_BSP_URL;#preparing-your-build-host-to-work-with-bsp-layers'>Preparing Your Build Host to Work With BSP Layers</ulink>"
@@ -238,8 +238,7 @@
                     </para></listitem>
                 <listitem><para>
                     Be sure to always work in matching branches for both
-                    the selected BSP repository and the
-                    <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
+                    the selected BSP repository and the Source Directory
                     (i.e. <filename>poky</filename>) repository.
                     For example, if you have checked out the "master" branch
                     of <filename>poky</filename> and you are going to use
@@ -553,7 +552,7 @@
             As mentioned briefly in the previous section and also in the
             "<link linkend='gs-git-workflows-and-the-yocto-project'>Git Workflows and the Yocto Project</link>"
             section, the Yocto Project maintains source repositories at
-            <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.
+            <ulink url='&YOCTO_GIT_URL;'></ulink>.
             If you look at this web-interface of the repositories, each item
             is a separate Git repository.
         </para>
diff --git a/documentation/overview-manual/overview-manual-intro.xml b/documentation/overview-manual/overview-manual-intro.xml
index 2976f7c1b6..de1b5cf131 100644
--- a/documentation/overview-manual/overview-manual-intro.xml
+++ b/documentation/overview-manual/overview-manual-intro.xml
@@ -101,7 +101,7 @@
             section in the Yocto Project Reference Manual.
             For a paper showing how to set up and run a quick build using the
             Yocto Project, see the
-            "<ulink url='&YOCTO_DOCS_BRIEF_URL;'>My First Yocto Project Build</ulink>"
+            "<ulink url='&YOCTO_DOCS_BRIEF_URL;'>Yocto Project Quick Build</ulink>"
             paper.
         </para>
     </section>
diff --git a/documentation/overview-manual/overview-manual-yp-intro.xml b/documentation/overview-manual/overview-manual-yp-intro.xml
index 03ba662bc3..2dbff165ab 100644
--- a/documentation/overview-manual/overview-manual-yp-intro.xml
+++ b/documentation/overview-manual/overview-manual-yp-intro.xml
@@ -359,7 +359,7 @@
             in this section.
             <note>
                 For general information on BSP layer structure, see the
-                <ulink url='&YOCTO_DOCS_BSP_URL;#bsp'>Board Support Packages (BSP) - Developer's Guide</ulink>.
+                <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Packages (BSP) Developer's Guide</ulink>.
             </note>
         </para>
 
@@ -482,7 +482,8 @@
                         </para>
 
                         <para>For information on the eSDK, see the
-                        <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and Extensible Software Development Kit (eSDK) Manual</ulink>.
+                        <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</ulink>
+                        Manual.
                         </para></listitem>
                     <listitem><para>
                         <emphasis><trademark class='trade'>Eclipse</trademark> IDE Plug-in:</emphasis>
@@ -1175,7 +1176,7 @@
                     and programming changes back into the image to make
                     their code available to other application developers.
                     For information on the eSDK, see the
-                    <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and Extensible Software Development Kit (eSDK)</ulink>
+                    <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</ulink>
                     manual.
                     </para></listitem>
                 <listitem><para>