diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
index 0dff736dea..21337208a1 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
@@ -345,7 +345,7 @@
                         A special value of "now" causes the checkout to
                         be updated on every build.
                         </para></listitem>
-                    <listitem><para><emphasis><filename>CVSDIR</filename>:</emphasis>
+                    <listitem><para><emphasis><link linkend='var-CVSDIR'><filename>CVSDIR</filename></link>:</emphasis>
                         Specifies where a temporary checkout is saved.
                         The location is often <filename>DL_DIR/cvs</filename>.
                         </para></listitem>
@@ -394,7 +394,8 @@
                         Effectively, you are renaming the output directory
                         to which the module is unpacked.
                         You are forcing the module into a special
-                        directory relative to <filename>CVSDIR</filename>.
+                        directory relative to
+                        <link linkend='var-CVSDIR'><filename>CVSDIR</filename></link>.
                         </para></listitem>
                     <listitem><para><emphasis>"rsh"</emphasis>
                         Used in conjunction with the "method" parameter.
@@ -435,9 +436,9 @@
                 The executable used is specified by
                 <filename>FETCHCMD_svn</filename>, which defaults
                 to "svn".
-                The fetcher's temporary working directory is set
-                by <filename>SVNDIR</filename>, which is usually
-                <filename>DL_DIR/svn</filename>.
+                The fetcher's temporary working directory is set by
+                <link linkend='var-SVNDIR'><filename>SVNDIR</filename></link>,
+                which is usually <filename>DL_DIR/svn</filename>.
             </para>
 
             <para>
@@ -491,8 +492,9 @@
                 This fetcher submodule fetches code from the Git
                 source control system.
                 The fetcher works by creating a bare clone of the
-                remote into <filename>GITDIR</filename>, which is
-                usually <filename>DL_DIR/git2</filename>.
+                remote into
+                <link linkend='var-GITDIR'><filename>GITDIR</filename></link>,
+                which is usually <filename>DL_DIR/git2</filename>.
                 This bare clone is then cloned into the work directory during the
                 unpack stage when a specific tree is checked out.
                 This is done using alternates and by reference to