15 files changed, 30 insertions, 28 deletions

diff --git a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
index f7e0d17d4c..f0e9afb7c6 100644
--- a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
+++ b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
@@ -52,8 +52,7 @@
         <para>
             If you want more conceptual or background information on the
             Yocto Project, see the
-            <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
-            manual.
+            <ulink url='&YOCTO_DOCS_GS_URL;'>Yocto Project Overview and Concepts Manual</ulink>.
         </para>
     </section>
 
@@ -301,13 +300,15 @@
                     the beginner.
                     </para></listitem>
                 <listitem><para>
-                    <emphasis>Getting Started With Yocto Project:</emphasis>
+                    <emphasis>Yocto Project Overview and Concepts Manual:</emphasis>
                     The
-                    <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
-                    manual is a great place to start to learn about the
+                    <ulink url='&YOCTO_DOCS_GS_URL;'>Yocto Project Overview and Concepts Manual</ulink>
+                    is a great place to start to learn about the
                     Yocto Project.
                     This manual introduces you to the Yocto Project and its
                     development environment.
+                    The manual also provides conceptual information for
+                    various aspects of the Yocto Project.
                     </para></listitem>
                 <listitem><para>
                     <emphasis>Yocto Project Wiki:</emphasis>
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 297478d656..6150985769 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1057,8 +1057,8 @@
                 OpenEmbedded build system knows about.
                 For more information on layers, see the
                 "<ulink url='&YOCTO_DOCS_GS_URL;#the-yocto-project-layer-model'>The Yocto Project Layer Model</ulink>"
-                section in the Getting Started With Yocto Project
-                manual.
+                section in the Yocto Project Overview and Concepts
+                Manual.
                 You can also reference the
                 "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>"
                 section in the Yocto Project Development Tasks
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d273eaedd9..fd1734beec 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -25,7 +25,7 @@
             For introductory information on the Yocto Project Layer Model,
             see the
             "<ulink url='&YOCTO_DOCS_GS_URL;#the-yocto-project-layer-model'>The Yocto Project Layer Model</ulink>"
-            section in the Getting Started With Yocto Project manual.
+            section in the Yocto Project Overview and Concepts Manual.
         </para>
 
         <section id='creating-your-own-layer'>
@@ -1856,7 +1856,7 @@
             <para>
                 You can find more information about the build process in
                 "<ulink url='&YOCTO_DOCS_GS_URL;#overview-development-environment'>The Yocto Project Development Environment</ulink>"
-                chapter of the Getting Started With Yocto Project manual.
+                chapter of the Yocto Project Overview and Concepts Manual.
             </para>
         </section>
 
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 0965cd5cf6..d6d95d6ee3 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -550,7 +550,7 @@
         You do this by pushing to a contribution repository that is upstream.
         See the
         "<ulink url='&YOCTO_DOCS_GS_URL;#workflows'>Workflows</ulink>"
-        section in the Getting Started With Yocto Project manual for additional
+        section in the Yocto Project Overview and Concepts Manual for additional
         concepts on working in the Yocto Project development environment.
     </para>
 
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 30fdb6be5c..f7f274bc8d 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -261,12 +261,12 @@
                     For concepts and introductory information about Git as it
                     is used in the Yocto Project, see the
                     "<ulink url='&YOCTO_DOCS_GS_URL;#git'>Git</ulink>"
-                    section in the Getting Started With Yocto Project manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                     </para></listitem>
                 <listitem><para>
                     For concepts on Yocto Project source repositories, see the
                     "<ulink url='&YOCTO_DOCS_GS_URL;#yocto-project-repositories'>Yocto Project Source Repositories</ulink>"
-                    section in the Getting Started With Yocto Project manual."
+                    section in the Yocto Project Overview and Concepts Manual."
                     </para></listitem>
             </itemizedlist>
         </note>
diff --git a/documentation/getting-started/getting-started-concepts.xml b/documentation/getting-started/getting-started-concepts.xml
index a534deafee..b7b31b33d9 100644
--- a/documentation/getting-started/getting-started-concepts.xml
+++ b/documentation/getting-started/getting-started-concepts.xml
@@ -204,7 +204,7 @@
             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 Getting Started With Yocto Project manual.
+            section in the Yocto Project Overview and Concepts Manual.
             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.
diff --git a/documentation/getting-started/getting-started-intro.xml b/documentation/getting-started/getting-started-intro.xml
index 56c4fb92e9..dcda2ab6db 100644
--- a/documentation/getting-started/getting-started-intro.xml
+++ b/documentation/getting-started/getting-started-intro.xml
@@ -4,12 +4,12 @@
 
 <chapter id='overview-manual-intro'>
 
-<title>The Getting Started With Yocto Project Manual</title>
+<title>The Yocto Project Overview and Concepts Manual</title>
     <section id='getting-started-welcome'>
         <title>Welcome</title>
 
         <para>
-            Welcome to the Getting Started With Yocto Project manual!
+            Welcome to the Yocto Project Overview and Concepts 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
diff --git a/documentation/getting-started/getting-started.xml b/documentation/getting-started/getting-started.xml
index 19f869eb21..cb5d0f5662 100644
--- a/documentation/getting-started/getting-started.xml
+++ b/documentation/getting-started/getting-started.xml
@@ -17,7 +17,7 @@
         </mediaobject>
 
         <title>
-            Getting Started With Yocto Project
+            Yocto Project Overview and Concepts Manual
         </title>
 
         <authorgroup>
@@ -54,8 +54,8 @@
                <itemizedlist>
                    <listitem><para>
                        This version of the
-                       <emphasis>Getting Started With Yocto Project</emphasis>
-                       manual is for the &YOCTO_DOC_VERSION; release of the
+                       <emphasis>Yocto Project Overview and Concepts Manual</emphasis>
+                       is for the &YOCTO_DOC_VERSION; release of the
                        Yocto Project.
                        To be sure you have the latest version of the manual
                        for this release, go to the
@@ -100,6 +100,8 @@
 
     <xi:include href="getting-started-development-environment.xml"/>
 
+    <xi:include href="getting-started-concepts.xml" />
+
 </book>
 <!--
 vim: expandtab tw=80 ts=4
diff --git a/documentation/kernel-dev/kernel-dev-concepts-appx.xml b/documentation/kernel-dev/kernel-dev-concepts-appx.xml
index 9105f43aef..46b5df0773 100644
--- a/documentation/kernel-dev/kernel-dev-concepts-appx.xml
+++ b/documentation/kernel-dev/kernel-dev-concepts-appx.xml
@@ -240,8 +240,8 @@
                         You can also get an introduction to Git as it
                         applies to the Yocto Project in the
                         "<ulink url='&YOCTO_DOCS_GS_URL;#git'>Git</ulink>"
-                        section in the Getting Started With Yocto Project
-                        manual.
+                        section in the Yocto Project Overview and Concepts
+                        Manual.
                         The latter reference provides an overview of
                         Git and presents a minimal set of Git commands
                         that allows you to be functional using Git.
diff --git a/documentation/kernel-dev/kernel-dev-intro.xml b/documentation/kernel-dev/kernel-dev-intro.xml
index 00763ec7e0..ab087ce529 100644
--- a/documentation/kernel-dev/kernel-dev-intro.xml
+++ b/documentation/kernel-dev/kernel-dev-intro.xml
@@ -112,8 +112,7 @@
                 document.
                 </para></listitem>
             <listitem><para>
-                <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
-                manual.
+                <ulink url='&YOCTO_DOCS_GS_URL;'>Yocto Project Overview and Concepts Manual</ulink>.
                 </para></listitem>
             <listitem><para>
                 <ulink url='&YOCTO_DOCS_SDK_URL;#using-devtool-in-your-sdk-workflow'><filename>devtool</filename> workflow</ulink>
diff --git a/documentation/ref-manual/faq.xml b/documentation/ref-manual/faq.xml
index 394ae9bc6e..770162c0ef 100644
--- a/documentation/ref-manual/faq.xml
+++ b/documentation/ref-manual/faq.xml
@@ -418,7 +418,7 @@
             <para>
                 You can find more information on licensing in the
                 "<ulink url='&YOCTO_DOCS_GS_URL;#licensing'>Licensing</ulink>"
-                section in the Getting Started With Yocto Project manual
+                section in the Yocto Project Overview and Concepts Manual
                 and also in the
                 "<ulink url='&YOCTO_DOCS_DEV_URL;#maintaining-open-source-license-compliance-during-your-products-lifecycle'>Maintaining Open Source License Compliance During Your Product's Lifecycle</ulink>"
                 section in the Yocto Project Development Tasks Manual.
diff --git a/documentation/ref-manual/ref-system-requirements.xml b/documentation/ref-manual/ref-system-requirements.xml
index 82324bd9b6..cc6a172bf9 100644
--- a/documentation/ref-manual/ref-system-requirements.xml
+++ b/documentation/ref-manual/ref-system-requirements.xml
@@ -22,7 +22,7 @@
         For introductory information on the Yocto Project, see the
         <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink> and the
         "<ulink url='&YOCTO_DOCS_GS_URL;#overview-development-environment'>Yocto Project Development Environment</ulink>"
-        chapter in the Getting Started With Yocto Project manual.
+        chapter in the Yocto Project Overview and Concepts Manual.
     </para>
 
     <para>
diff --git a/documentation/ref-manual/ref-terms.xml b/documentation/ref-manual/ref-terms.xml
index aebd6e2ba2..31bcbe6e0b 100644
--- a/documentation/ref-manual/ref-terms.xml
+++ b/documentation/ref-manual/ref-terms.xml
@@ -246,7 +246,7 @@
 
                 <para>For introductory information on layers, see the
                 "<ulink url='&YOCTO_DOCS_GS_URL;#the-yocto-project-layer-model'>The Yocto Project Layer Model</ulink>"
-                section in the Getting Started With Yocto Project manual.
+                section in the Yocto Project Overview and Concepts Manual.
                 For more detailed information on 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.
@@ -471,7 +471,7 @@
                 <para>For more information on concepts related to Git
                 repositories, branches, and tags, see the
                 "<ulink url='&YOCTO_DOCS_GS_URL;#repositories-tags-and-branches'>Repositories, Tags, and Branches</ulink>"
-                section in the Getting Started With Yocto Project manual.
+                section in the Yocto Project Overview and Concepts Manual.
                 </para></listitem>
             <listitem><para><emphasis>Task:</emphasis>
                 A unit of execution for BitBake (e.g.
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 865f40904b..ae4e95a472 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -93,7 +93,7 @@
                 <para>
                     For general information on layers, see the
                     "<ulink url='&YOCTO_DOCS_GS_URL;#the-yocto-project-layer-model'>The Yocto Project Layer Model</ulink>"
-                    section in the Getting Started With Yocto Project manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                     For information 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.
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index 436c732b57..f93adba725 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -27,7 +27,7 @@ s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/toaster-manual\/toaste
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/brief-yoctoprojectqs\/brief-yoctoprojectqs.html" target="_top">Yocto Project Quick Build<\/a>/Yocto Project Quick Build/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html" target="_top">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html" target="_top">Yocto Project Development Tasks Manual<\/a>/Yocto Project Development Tasks Manual/g
-s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html" target="_top">Getting Started With Yocto Project<\/a>/Getting Started With Yocto Project/g
+s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html" target="_top">Yocto Project Overview and Concepts Manual<\/a>/Yocto project Overview and Concepts Manual/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html" target="_top">Yocto Project Application Development and the Extensible Software Development Kit (eSDK)<\/a>/Yocto Project Application Development and the Extensible Software Development Kit (eSDK)/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html" target="_top">Yocto Project Board Support Package (BSP) Developer's Guide<\/a>/Yocto Project Board Support Package (BSP) Developer's Guide/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html" target="_top">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g