2 files changed, 11 insertions, 15 deletions

diff --git a/documentation/overview-manual/overview-manual-concepts.xml b/documentation/overview-manual/overview-manual-concepts.xml
index 123cf15d19..5067e3f627 100644
--- a/documentation/overview-manual/overview-manual-concepts.xml
+++ b/documentation/overview-manual/overview-manual-concepts.xml
@@ -203,8 +203,8 @@
         <para>
             For more introductory information on the Yocto Project's layer
             model, see the
-            "<ulink url='&YOCTO_DOCS_GS_URL;#the-yocto-project-layer-model'>The Yocto Project Layer Model</ulink>"
-            section in the Yocto Project Overview and Concepts Manual.
+            "<link linkend='the-yocto-project-layer-model'>The Yocto Project Layer Model</link>"
+            section.
             For procedures on how to create layers, see the
             "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
             section in the Yocto Project Development Tasks Manual.
@@ -1567,7 +1567,7 @@
                     <ulink url='&YOCTO_DOCS_REF_URL;#var-STAMP'><filename>STAMP</filename></ulink>
                     variable, and the end of the name consists of the task's
                     name and current
-                    <ulink url='&YOCTO_DOCS_GS_URL;#overview-checksums'>input checksum</ulink>.
+                    <link linkend='overview-checksums'>input checksum</link>.
                     <note>
                         This naming scheme assumes that
                         <ulink url='&YOCTO_DOCS_BB_URL;#var-BB_SIGNATURE_HANDLER'><filename>BB_SIGNATURE_HANDLER</filename></ulink>
diff --git a/documentation/overview-manual/overview-manual-yp-intro.xml b/documentation/overview-manual/overview-manual-yp-intro.xml
index 437635842a..c38de74fd1 100644
--- a/documentation/overview-manual/overview-manual-yp-intro.xml
+++ b/documentation/overview-manual/overview-manual-yp-intro.xml
@@ -654,9 +654,8 @@
                         when they do not.</para>
 
                         <para>You can read more about Pseudo in the
-                        "<ulink url='&YOCTO_DOCS_GS_URL;#fakeroot-and-pseudo'>Fakeroot and Pseudo</ulink>"
-                        section of the Yocto Project Overview and Concepts
-                        Manual.
+                        "<link linkend='fakeroot-and-pseudo'>Fakeroot and Pseudo</link>"
+                        section.
                         </para></listitem>
                 </itemizedlist>
             </para>
@@ -695,10 +694,8 @@
                         the Yocto Project.
                         The Yocto Project and the OpenEmbedded Project both
                         maintain the OpenEmbedded-Core.
-                        You can find the OE-Core metadata in the Yocto
-                        Project
-                        <ulink url='&YOCTO_DOCS_GS_URL;#source-repositories'>Source Repositories</ulink>
-                        <ulink url='https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta'>here</ulink>.
+                        You can find the OE-Core metadata in the Yocto Project
+                        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta'>Source Repositories</ulink>.
                         </para>
 
                         <para>Historically, the Yocto Project integrated the
@@ -777,9 +774,8 @@
                         in constrained environments.</para>
 
                         <para>You can find the Matchbox source in its
-                        <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi'>repository</ulink>
-                        listed in the Yocto Project
-                        <ulink url='&YOCTO_DOCS_GS_URL;#source-repositories'>Source Repositories</ulink>.
+                        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'>repository</ulink>
+                        listed in the Yocto Project Source Repositories.
                         </para></listitem>
                     <listitem><para>
                         <emphasis>Opkg</emphasis>
@@ -1143,8 +1139,8 @@
 
         <para>
             For a very detailed look at this workflow, see the
-            "<ulink url='&YOCTO_DOCS_GS_URL;#development-concepts'>Development Concepts</ulink>"
-            section in the Yocto Project Overview and Concepts Manual.
+            "<link linkend='development-concepts'>Development Concepts</link>"
+            section.
         </para>
     </section>