1 files changed, 45 insertions, 42 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 76194d450b..01bbc1c473 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3017,7 +3017,7 @@
                    <note><title>Caution</title>
                        Tasks that read from or write to this directory should
                        run under
-                        <ulink url='&YOCTO_DOCS_CM_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
+                        <ulink url='&YOCTO_DOCS_GS_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
                    </note>
                </para>
            </glossdef>
@@ -3264,10 +3264,10 @@
                                add any runtime dependencies between the
                                packages produced by the two recipes.
                                However, as explained in the
-                                "<ulink url='&YOCTO_DOCS_CM_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
+                                "<ulink url='&YOCTO_DOCS_GS_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
-                                section in the Yocto Project Concepts Manual,
+                                section in the Yocto Project Overview and
-                                runtime dependencies will often be
+                                Concepts Manual, runtime dependencies will
-                                added automatically, meaning
+                                often be added automatically, meaning
                                <filename>DEPENDS</filename> alone is
                                sufficient for most recipes.
                                </para></listitem>
@@ -3329,11 +3329,12 @@
                    section.
                    For more detail on the contents of the
                    <filename>deploy</filename> directory, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#images-dev-environment'>Images</ulink>",
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#images-dev-environment'>Images</ulink>",
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#package-feeds-dev-environment'>Package Feeds</ulink>",
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#package-feeds-dev-environment'>Package Feeds</ulink>",
                    and
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#sdk-dev-environment'>Application Development SDK</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#sdk-dev-environment'>Application Development SDK</ulink>"
-                    sections all in the Yocto Project Concepts Manual.
+                    sections all in the Yocto Project Overview and Concepts
+                    Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -3372,8 +3373,8 @@
                    <link linkend='ref-tasks-package_write_deb'><filename>do_package_write_deb</filename></link>
                    task writes Debian packages into the appropriate folder.
                    For more information on how packaging works, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -3402,10 +3403,11 @@
                    section.
                    For more detail on the contents of the
                    <filename>deploy</filename> directory, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#images-dev-environment'>Images</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#images-dev-environment'>Images</ulink>"
                    and
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#sdk-dev-environment'>Application Development SDK</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#sdk-dev-environment'>Application Development SDK</ulink>"
-                    sections both in the Yocto Project Concepts Manual.
+                    sections both in the Yocto Project Overview and Concepts
+                    Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -3443,8 +3445,8 @@
                    <link linkend='ref-tasks-package_write_ipk'><filename>do_package_write_ipk</filename></link>
                    task writes IPK packages into the appropriate folder.
                    For more information on how packaging works, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -3482,8 +3484,8 @@
                    <link linkend='ref-tasks-package_write_rpm'><filename>do_package_write_rpm</filename></link>
                    task writes RPM packages into the appropriate folder.
                    For more information on how packaging works, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -3521,8 +3523,8 @@
                    <link linkend='ref-tasks-package_write_tar'><filename>do_package_write_tar</filename></link>
                    task writes TAR packages into the appropriate folder.
                    For more information on how packaging works, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#package-feeds-dev-environment'>Package Feeds</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -6104,8 +6106,8 @@
                    variables.
                    You can find information on how the image
                    is created in the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#image-generation-dev-environment'>Image Generation</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#image-generation-dev-environment'>Image Generation</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -7978,8 +7980,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                    <link linkend='var-LICENSE'><filename>LICENSE</filename></link>
                    is set to "CLOSED").</para>
                <para>For more information, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#usingpoky-configuring-LIC_FILES_CHKSUM'>Tracking License Changes</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#usingpoky-configuring-LIC_FILES_CHKSUM'>Tracking License Changes</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -8114,8 +8116,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                    require additional licenses in order to be used in a
                    commercial product.
                    For more information, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#enabling-commercially-licensed-recipes'>Enabling Commercially Licensed Recipes</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#enabling-commercially-licensed-recipes'>Enabling Commercially Licensed Recipes</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -8134,8 +8136,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                    This practice is otherwise known as "whitelisting"
                    license flags.
                    For more information, see the
-                    <ulink url='&YOCTO_DOCS_CM_URL;#enabling-commercially-licensed-recipes'>Enabling Commercially Licensed Recipes</ulink>"
+                    <ulink url='&YOCTO_DOCS_GS_URL;#enabling-commercially-licensed-recipes'>Enabling Commercially Licensed Recipes</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -10488,8 +10490,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
     ${STAGING_DIR_HOST}/pkgdata
                    </literallayout>
                    For examples of how this data is used, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
-                    section in the Yocto Project Concepts Manual and the
+                    section in the Yocto Project Overview and Concepts Manual
+                    and the
                    "<ulink url='&YOCTO_DOCS_DEV_URL;#viewing-package-information-with-oe-pkgdata-util'>Viewing Package Information with <filename>oe-pkgdata-util</filename></ulink>"
                    section in the Yocto Project Development Tasks Manual.
                </para>
@@ -10735,11 +10738,11 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                        <filename>PR</filename> to know when to rebuild a
                        recipe.
                        The build system uses the task
-                        <ulink url='&YOCTO_DOCS_CM_URL;#overview-checksums'>input checksums</ulink>
+                        <ulink url='&YOCTO_DOCS_GS_URL;#overview-checksums'>input checksums</ulink>
                        along with the
                        <link linkend='structure-build-tmp-stamps'>stamp</link>
                        and
-                        <ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>shared state cache</ulink>
+                        <ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>shared state cache</ulink>
                        mechanisms.
                    </note>
                    The <filename>PR</filename> variable primarily becomes
@@ -11008,8 +11011,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                <para>
                    For more information, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
            </glossdef>
        </glossentry>
@@ -11325,8 +11328,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                    Therefore, most recipes do not need to set
                    <filename>RDEPENDS</filename>.
                    For more information, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#automatically-added-runtime-dependencies'>Automatically Added Runtime Dependencies</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
                <para>
@@ -13845,8 +13848,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                <para>
                    For information on how BitBake uses stamp files to determine
                    if a task should be rerun, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#stamp-files-and-the-rerunning-of-tasks'>Stamp Files and the Rerunning of Tasks</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#stamp-files-and-the-rerunning-of-tasks'>Stamp Files and the Rerunning of Tasks</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                </para>
                <para>
@@ -15337,8 +15340,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                <para>
                    For background information on cross-development toolchains
                    in the Yocto Project development environment, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#cross-development-toolchain-generation'>Cross-Development Toolchain Generation</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#cross-development-toolchain-generation'>Cross-Development Toolchain Generation</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                    For information on setting up a cross-development
                    environment, see the
                    <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</ulink>
@@ -15396,8 +15399,8 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                <para>
                    For background information on cross-development toolchains
                    in the Yocto Project development environment, see the
-                    "<ulink url='&YOCTO_DOCS_CM_URL;#cross-development-toolchain-generation'>Cross-Development Toolchain Generation</ulink>"
+                    "<ulink url='&YOCTO_DOCS_GS_URL;#cross-development-toolchain-generation'>Cross-Development Toolchain Generation</ulink>"
-                    section in the Yocto Project Concepts Manual.
+                    section in the Yocto Project Overview and Concepts Manual.
                    For information on setting up a cross-development
                    environment, see the
                    <ulink url='&YOCTO_DOCS_SDK_URL;'>Yocto Project Application Development and the Extensible Software Development Kit (eSDK)</ulink>