1 files changed, 16 insertions, 13 deletions

diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 8356cb4a5c..d2b96048b2 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -1,5 +1,6 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
 <!-- Dummy chapter -->
 <appendix id='ref-variables-glos'>
@@ -421,8 +422,9 @@
             <glossdef>
                 <para>Alias names used for the recipe in various Linux distributions.</para>
                 <para>See the  
-                    "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-configuring-DISTRO_PN_ALIAS'>Handling a Package Name Alias</ulink>"
-                    section in the Yocto Project Development Manual for more information.</para>
+                    "<ulink url='&YOCTO_DOCS_DEV_URL;#usingpoky-configuring-DISTRO_PN_ALIAS'>Handling
+                    a Package Name Alias</ulink>" section in the Yocto Project Development 
+                    Manual for more information.</para>
             </glossdef>
         </glossentry>
 
@@ -466,7 +468,8 @@
                 <para>
                     You can safely share this directory between multiple builds on the 
                     same development machine.  
-                    For additional information on how the build process gets source files, see the
+                    For additional information on how the build process gets source files
+                    when working behind a firewall or proxy server, see the
                     "<link linkend='how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>FAQ</link>"
                     appendix.
                 </para>
@@ -663,7 +666,7 @@
                     The default value for the <filename>FILESPATH</filename> variable is defined
                     in the <filename>base.bbclass</filename> class found in 
                     <filename>meta/classes</filename> in the 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-files'>Yocto Project Files</ulink>:
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto Project Files</ulink>:
                     <literallayout class='monospaced'>
 FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
    "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", \
@@ -1085,7 +1088,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
                     is set to "CLOSED")</para>
                 <para>For more information, see the
                     <link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>
-                    Track License Change</link> section</para>
+                    Tracking License Changes</link> section</para>
             </glossdef>
         </glossentry>
 
@@ -1577,7 +1580,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
         <glossentry id='var-S'><glossterm>S</glossterm>
             <glossdef>
                 <para>
-                    The location in the <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-build-directory'>
+                    The location in the <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>
                     Yocto Project Build Directory</ulink> where unpacked package source code resides.
                     This location is within the working directory 
                     (<filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>), which 
@@ -1590,7 +1593,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
  ${WORKDIR}/${PN}-${PV}
                     </literallayout>
                     As an example, assume a 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-files'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>
                     Yocto Project Files</ulink> top-level directory named <filename>poky</filename> 
                     and a default Yocto Project Build Directory of <filename>poky/build</filename>.
                     In this case, the working directory the build system uses to build 
@@ -1859,7 +1862,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
                     uses when it does its work building images. 
                     By default, the <filename>TMPDIR</filename> variable is named 
                     <filename>tmp</filename> within the 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-build-directory'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>
                     Yocto Project Build Directory</ulink>.
                 </para>
 
@@ -1867,7 +1870,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
                     If you want to establish this directory in a location other than the
                     default, you can uncomment the following statement in the 
                     <filename>conf/local.conf</filename> file in the 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-files'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>
                     Yocto Project Files</ulink>:
                     <literallayout class='monospaced'>
      #TMPDIR = "${TOPDIR}/tmp"
@@ -1880,7 +1883,7 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
             <glossdef>
                 <para>
                     This variable is the 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-build-directory'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>
                     Yocto Project Build Directory</ulink>.
                     BitBake automatically sets this variable.
                     The Yocto Project build system uses the build directory when building images. 
@@ -1928,10 +1931,10 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", \
  ${TMPDIR}/work/${PACKAGE_ARCH}-poky-${TARGET_OS}/${PN}-${PV}-${PR}
                     </literallayout>
                     As an example, assume a 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-files'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>
                     Yocto Project Files</ulink> top-level directory named <filename>poky</filename> 
                     and a default 
-                    <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-build-directory'>
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>
                     Yocto Project Build Directory</ulink> of <filename>poky/build</filename>.
                     In this case, the working directory the build system uses to build 
                     the <filename>v86d</filename> package is the following: