15 files changed, 23 insertions, 21 deletions

diff --git a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
index 5cd863787c..f7e0d17d4c 100644
--- a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
+++ b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
@@ -52,7 +52,8 @@
         <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 Manual</ulink>.
+            <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
+            manual.
         </para>
     </section>
 
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index ab9ac1888f..771f58c079 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1058,7 +1058,7 @@
                 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.
+                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/concepts-manual/concepts-manual-concepts.xml b/documentation/concepts-manual/concepts-manual-concepts.xml
index 285e1678a1..5c81863443 100644
--- a/documentation/concepts-manual/concepts-manual-concepts.xml
+++ b/documentation/concepts-manual/concepts-manual-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 Getting Started With Yocto Project 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/concepts-manual/concepts-manual-intro.xml b/documentation/concepts-manual/concepts-manual-intro.xml
index 410e9b12f7..5238a7cf06 100644
--- a/documentation/concepts-manual/concepts-manual-intro.xml
+++ b/documentation/concepts-manual/concepts-manual-intro.xml
@@ -47,7 +47,8 @@
                 <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>.
+                    <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
+                    manual.
                     </para></listitem>
                 <listitem><para>
                     <emphasis>Detailed Public Information Not Specific to the
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 175f4d4299..c2a42622a9 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 Getting Started With Yocto Project 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 Getting Started With Yocto Project manual.
             </para>
         </section>
 
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 68c8d9bbea..0965cd5cf6 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 Getting Started With Yocto Project 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 de0e9a603f..91ca71c05f 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 Getting Started With Yocto Project 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 Getting Started With Yocto Project manual."
                     </para></listitem>
             </itemizedlist>
         </note>
diff --git a/documentation/getting-started/getting-started-intro.xml b/documentation/getting-started/getting-started-intro.xml
index f2fa962429..56c4fb92e9 100644
--- a/documentation/getting-started/getting-started-intro.xml
+++ b/documentation/getting-started/getting-started-intro.xml
@@ -9,7 +9,7 @@
         <title>Welcome</title>
 
         <para>
-            Welcome to the Getting Started With Yocto Project Manual!
+            Welcome to the Getting Started With Yocto Project 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/kernel-dev/kernel-dev-concepts-appx.xml b/documentation/kernel-dev/kernel-dev-concepts-appx.xml
index 19e9fa994a..9105f43aef 100644
--- a/documentation/kernel-dev/kernel-dev-concepts-appx.xml
+++ b/documentation/kernel-dev/kernel-dev-concepts-appx.xml
@@ -241,7 +241,7 @@
                         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.
+                        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/ref-manual/faq.xml b/documentation/ref-manual/faq.xml
index 3c3351f4e6..394ae9bc6e 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 Getting Started With Yocto Project 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 f526b99090..b57ded293f 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 Getting Started With Yocto Project manual.
     </para>
 
     <para>
@@ -34,9 +34,9 @@
         <ulink url='&YOCTO_DOCS_DEV_URL;'>Yocto Project Development Tasks Manual</ulink>.
         You can find getting started and concepts information in the
         <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink>
-        and
-        <ulink url='&YOCTO_DOCS_CM_URL;'>Yocto Project Concepts Manual</ulink>
-        manuals, respectively.
+        manual and the
+        <ulink url='&YOCTO_DOCS_CM_URL;'>Yocto Project Concepts Manual</ulink>,
+        respectively.
         <note><title>Tip</title>
             For more information about the Yocto Project Documentation set,
             see the
diff --git a/documentation/ref-manual/ref-terms.xml b/documentation/ref-manual/ref-terms.xml
index c2a23e8bf1..0984503b8c 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 Getting Started With Yocto Project 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 Getting Started With Yocto Project manual.
                 </para></listitem>
             <listitem><para><emphasis>Task:</emphasis>
                 A unit of execution for BitBake (e.g.
diff --git a/documentation/ref-manual/resources.xml b/documentation/ref-manual/resources.xml
index ac6b46e16b..7dd8d12a76 100644
--- a/documentation/ref-manual/resources.xml
+++ b/documentation/ref-manual/resources.xml
@@ -168,7 +168,7 @@
                 </para></listitem>
             <listitem><para>
                 <emphasis>
-                <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project Manual</ulink>:
+                <ulink url='&YOCTO_DOCS_GS_URL;'>Getting Started With Yocto Project</ulink> Manual:
                 </emphasis>
                 This manual introduces the Yocto Project and provides
                 development environment basics.
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 45c71bc1b1..865f40904b 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 Getting Started With Yocto Project 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 d4ec510352..427907bcd5 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -28,7 +28,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 Manual<\/a>/Getting Started With Yocto Project 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\/concepts-manual\/concepts-manual.html" target="_top">Yocto Project Concepts Manual<\/a>/Yocto Project 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