diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 3ac223159b..167d107155 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -11024,7 +11024,7 @@ Some notes from Cal:
      ${BUILDDIR}/tmp/stamps/i586-poky-linux/db/6.0.30-r1.do_fetch.sigdata.7c048c18222b16ff0bcee2000ef648b1
                         </literallayout>
                         For tasks that are accelerated through the shared state
-                        (<ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>sstate</ulink>)
+                        (<ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>sstate</ulink>)
                         cache, an additional <filename>siginfo</filename> file
                         is written into
                         <ulink url='&YOCTO_DOCS_REF_URL;#var-SSTATE_DIR'><filename>SSTATE_DIR</filename></ulink>
diff --git a/documentation/getting-started/getting-started-intro.xml b/documentation/getting-started/getting-started-intro.xml
index a523159fe2..278f413dcf 100644
--- a/documentation/getting-started/getting-started-intro.xml
+++ b/documentation/getting-started/getting-started-intro.xml
@@ -5,7 +5,7 @@
 <chapter id='overview-manual-intro'>
 
 <title>Getting Started with Yocto Project Manual</title>
-    <section id='overview-welcome'>
+    <section id='getting-started-welcome'>
         <title>Welcome</title>
 
         <para>
@@ -77,7 +77,7 @@
         </para>
     </section>
 
-    <section id='overview-other-information'>
+    <section id='getting-started-overview-other-information'>
         <title>Other Information</title>
 
         <para>
diff --git a/documentation/ref-manual/ref-tasks.xml b/documentation/ref-manual/ref-tasks.xml
index 2afd9588b7..007d08f112 100644
--- a/documentation/ref-manual/ref-tasks.xml
+++ b/documentation/ref-manual/ref-tasks.xml
@@ -268,7 +268,7 @@
             and
             <link linkend='ref-tasks-rootfs'><filename>do_rootfs</filename></link>),
             run under
-            <ulink url='&YOCTO_DOCS_GS_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
+            <ulink url='&YOCTO_DOCS_CM_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
             <note>
                 <title>Caution</title>
 
@@ -630,7 +630,7 @@
 
         <para>
             Running this task does not remove the
-            <ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>sstate</ulink>
+            <ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>sstate</ulink>
             cache files.
             Consequently, if no changes have been made and the recipe is
             rebuilt after cleaning, output files are simply restored from the
@@ -647,7 +647,7 @@
 
         <para>
             Removes all output files, shared state
-            (<ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>sstate</ulink>)
+            (<ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>sstate</ulink>)
             cache, and downloaded source files for a target (i.e. the contents
             of
             <link linkend='var-DL_DIR'><filename>DL_DIR</filename></link>).
@@ -678,13 +678,13 @@
 
         <para>
             Removes all output files and shared state
-            (<ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>sstate</ulink>)
+            (<ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>sstate</ulink>)
             cache for a target.
             Essentially, the <filename>do_cleansstate</filename> task is
             identical to the
             <link linkend='ref-tasks-clean'><filename>do_clean</filename></link>
             task with the added removal of shared state
-            (<ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>sstate</ulink>)
+            (<ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>sstate</ulink>)
             cache.
         </para>
 
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 68b2daaa1e..f2497249b5 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_GS_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
+                        <ulink url='&YOCTO_DOCS_CM_URL;#fakeroot-and-pseudo'>fakeroot</ulink>.
                     </note>
                 </para>
             </glossdef>
@@ -10665,7 +10665,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                         along with the
                         <link linkend='structure-build-tmp-stamps'>stamp</link>
                         and
-                        <ulink url='&YOCTO_DOCS_GS_URL;#shared-state-cache'>shared state cache</ulink>
+                        <ulink url='&YOCTO_DOCS_CM_URL;#shared-state-cache'>shared state cache</ulink>
                         mechanisms.
                     </note>
                     The <filename>PR</filename> variable primarily becomes