From 64c70a7137894d3ac742fba0142f7c1337ead88c Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <srifenbark@gmail.com>
Date: Wed, 31 Jan 2018 09:49:46 -0800
Subject: concepts-manual: Content adjustments for the manual.

The manual's two files are an introductory chapter and then
a deeper concepts chapter. I scrubbed through the material, which
originated from the getting-started (overview-manual).

(From yocto-docs rev: 2ca572fac3ca71e73aad9bdd516a6ce90b148c53)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../concepts-manual/concepts-manual-concepts.xml   | 23 ++++++++++------------
 .../concepts-manual/concepts-manual-intro.xml      | 23 ++++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'documentation')

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>
diff --git a/documentation/concepts-manual/concepts-manual-intro.xml b/documentation/concepts-manual/concepts-manual-intro.xml
index 51a21b6e23..a50089a49e 100644
--- a/documentation/concepts-manual/concepts-manual-intro.xml
+++ b/documentation/concepts-manual/concepts-manual-intro.xml
@@ -2,18 +2,16 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
-<chapter id='overview-manual-intro'>
+<chapter id='concepts-manual-intro'>
 
-<title>The Yocto Project Overview Manual</title>
-    <section id='overview-welcome'>
+<title>The Yocto Project Concepts Manual</title>
+    <section id='concepts-overview-welcome'>
         <title>Welcome</title>
 
         <para>
-            Welcome to the Yocto Project Overview Manual!
-            This manual introduces the Yocto Project by providing concepts,
-            software overviews, best-known-methods (BKMs), and any other
-            high-level introductory information suitable for a new Yocto
-            Project user.
+            Welcome to the Yocto Project Concepts Manual!
+            This manual provides conceptual information that helps you
+            better understand the Yocto Project.
         </para>
 
         <para>
@@ -65,6 +63,11 @@
                     <ulink url='&YOCTO_DOCS_BSP_URL;'>Yocto Project Board Support Package (BSP) Developer's Guide</ulink>
                     contains reference information on BSPs.
                     </para></listitem>
+                <listitem><para>
+                    <emphasis>Getting Started Material:</emphasis>
+                    This type of material resides in the
+                    <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project Manual</ulink>.
+                    </para></listitem>
                 <listitem><para>
                     <emphasis>Detailed Public Information Not Specific to the
                     Yocto Project:</emphasis>
@@ -77,12 +80,12 @@
         </para>
     </section>
 
-    <section id='overview-other-information'>
+    <section id='concepts-overview-other-information'>
         <title>Other Information</title>
 
         <para>
             Because this manual presents information for many different
-            topics, supplemental information is recommended for full
+            concepts, supplemental information is recommended for full
             comprehension.
             For additional introductory information on the Yocto Project, see
             the <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink>.
-- 
cgit v1.2.3-54-g00ecf