1 files changed, 10 insertions, 13 deletions

diff --git a/documentation/concepts-manual/concepts-manual-concepts.xml b/documentation/concepts-manual/concepts-manual-concepts.xml
index e4d6026b70..4ad4ebc74b 100644
--- a/documentation/concepts-manual/concepts-manual-concepts.xml
+++ b/documentation/concepts-manual/concepts-manual-concepts.xml
@@ -59,8 +59,8 @@
             Following are some brief details on these core components.
             For additional information on how these components interact during
             a build, see the
-            "<link linkend='development-concepts'>Development Concepts</link>"
-            section.
+            "<ulink url='&YOCTO_DOCS_GS_URL;#development-concepts'>Development Concepts</ulink>"
+            section in the Getting Started With Yocto Project Manual.
         </para>
 
         <section id='usingpoky-components-bitbake'>
@@ -135,7 +135,7 @@
             </para>
         </section>
 
-        <section id='usingpoky-components-metadata'>
+        <section id='concepts-components-metadata'>
             <title>Metadata (Recipes)</title>
 
             <para>
@@ -219,7 +219,7 @@
             </para>
         </section>
 
-        <section id='usingpoky-components-classes'>
+        <section id='concepts-components-classes'>
             <title>Classes</title>
 
             <para>
@@ -238,7 +238,7 @@
             </para>
         </section>
 
-        <section id='usingpoky-components-configuration'>
+        <section id='concepts-components-configuration'>
             <title>Configuration</title>
 
             <para>
@@ -471,9 +471,6 @@
         </note>
     </section>
 
-
-
-
     <section id="shared-state-cache">
         <title>Shared State Cache</title>
 
@@ -554,7 +551,7 @@
             state, and some tips and tricks.
         </para>
 
-        <section id='overall-architecture'>
+        <section id='concepts-overall-architecture'>
             <title>Overall Architecture</title>
 
             <para>
@@ -1007,11 +1004,11 @@
                 Since the sysroot is not used, it would never get extracted.
                 This is another reason why a task-based approach is preferred
                 over a recipe-based approach, which would have to install the
-                output from every task.
+                output from every task.n
             </para>
         </section>
 
-        <section id='tips-and-tricks'>
+        <section id='concepts-tips-and-tricks'>
             <title>Tips and Tricks</title>
 
             <para>
@@ -1021,7 +1018,7 @@
                 around issues related to shared state code.
             </para>
 
-            <section id='overview-debugging'>
+            <section id='concepts-overview-debugging'>
                 <title>Debugging</title>
 
                 <para>
@@ -1038,7 +1035,7 @@
                 </para>
             </section>
 
-            <section id='invalidating-shared-state'>
+            <section id='concepts-invalidating-shared-state'>
                 <title>Invalidating Shared State</title>
 
                 <para>