2 files changed, 23 insertions, 22 deletions

diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 642a52b01c..360166d031 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -1,5 +1,6 @@
 <!DOCTYPE book 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; ] >
 
 <book id='bsp-guide' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,7 +59,7 @@
         </revhistory>
 
     <copyright>
-      <year>2010-2012</year>
+      <year>&COPYRIGHT_YEAR;</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -70,9 +71,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and the 
-          <ulink url='http://www.yoctoproject.org/docs/latest/bsp-guide/bsp-guide.html'>
+          <ulink url='&YOCTO_DOCS_BSP_URL;'>
           Board Support Package (BSP) Developer's Guide</ulink> on
-          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
+          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
     </legalnotice>
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 35dae930f9..a49c0bef0b 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1,5 +1,6 @@
 <!DOCTYPE chapter 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; ] >
 
 <chapter id='bsp'>
 
@@ -18,7 +19,7 @@
         </para>
 
         <para>
-            This section (or document if you are reading the BSP Developer's Guide) defines
+            This chapter (or document if you are reading the BSP Developer's Guide) defines
             a structure for these components
             so that BSPs follow a commonly understood layout.
             Providing a common form allows end-users to understand and become familiar 
@@ -30,10 +31,10 @@
         <note>
             The information here does not provide an example of how to create a BSP.
             For examples on how to create a BSP, see the
-            "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#dev-manual-bsp-appendix'>BSP Development Example</ulink>"
+            "<ulink url='&YOCTO_DOCS_DEV_URL;#dev-manual-bsp-appendix'>BSP Development Example</ulink>"
             section in The Yocto Project Development Manual.
             You can also see the 
-            <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_creating_one_generic_Atom_BSP_from_another'>
+            <ulink url='&YOCTO_WIKI_URL;/wiki/Transcript:_creating_one_generic_Atom_BSP_from_another'>
             wiki page</ulink>.
         </note>
 
@@ -77,7 +78,7 @@
             <para>
                 The Yocto Project organizes BSP Layers within the Yocto Metadata Layers area 
                 of the Yocto Project Source Repositories at 
-                <ulink url='http://git.yoctoproject.org/cgit.cgi'></ulink>.
+                <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.
                 If you examine the source repositories, you will find many BSP Layers.
                 Here are a few:
                 <literallayout class='monospaced'>
@@ -105,7 +106,7 @@
                 of the BSP Layer.
                 This root is what you add to the <filename>BBLAYERS</filename>
                 variable in the <filename>conf/bblayers.conf</filename> file found in the 
-                <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-build-directory'>Yocto Project Build Directory</ulink>.
+                <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-build-directory'>Yocto Project Build Directory</ulink>.
                 Adding the root allows the Yocto Project build system to recognize the BSP 
                 definition and from it build an image.
                 Here is an example:
@@ -120,11 +121,10 @@
 
             <para>
                 For more detailed information on layers, see the 
-                "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>" 
+                "<ulink url='&YOCTO_DOCS_DEV_URL;#understanding-and-creating-layers'>Understanding and Creating Layers</ulink>" 
                 section of the Yocto Project Development Manual.
                 You can also see the detailed examples in the appendices of  
-                <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html'>
-                The Yocto Project Development Manual</ulink>.
+                <ulink url='&YOCTO_DOCS_DEV_URL;'>The Yocto Project Development Manual</ulink>.
             </para>
         </section>
 
@@ -276,7 +276,7 @@
                 images appropriate to the target system.
                 This directory typically contains graphical (e.g. sato) and minimal live images 
                 when the BSP tarball has been created and made available in the 
-                <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website. 
+                <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website. 
                 You can use these kernels and images to get a system running and quickly get started 
                 on development tasks.
             </para>
@@ -355,12 +355,12 @@
                 If the BSP supports multiple machines, multiple machine configuration files
                 can be present. 
                 These filenames correspond to the values to which users have set the 
-                <ulink url='http://www.yoctoproject.org/docs/latest/poky-ref-manual/poky-ref-manual.html#var-MACHINE'><filename>MACHINE</filename></ulink> variable.
+                <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink> variable.
             </para>
 
             <para>
                 These files define things such as the kernel package to use
-                (<ulink url='http://www.yoctoproject.org/docs/latest/poky-ref-manual/poky-ref-manual.html#var-PREFERRED_PROVIDER'><filename>PREFERRED_PROVIDER</filename></ulink>
+                (<ulink url='&YOCTO_DOCS_REF_URL;#var-PREFERRED_PROVIDER'><filename>PREFERRED_PROVIDER</filename></ulink>
                 of virtual/kernel), the hardware drivers to
                 include in different types of images, any special software components
                 that are needed, any bootloader information, and also any special image
@@ -392,7 +392,7 @@
             <para>
                 Tuning files are found in the <filename>meta/conf/machine/include</filename>
                 directory of 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>.
                 Tuning files can also reside in the BSP Layer itself.  
                 For example, the <filename>ia32-base.inc</filename> file resides in the 
                 <filename>meta-intel</filename> BSP Layer in <filename>conf/machine/include</filename>.
@@ -444,7 +444,7 @@
                 formfactor recipe 
                 <filename>meta/recipes-bsp/formfactor/formfactor_0.0.bb</filename>, 
                 which is found 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>.
             </para></note>
             </section>
 
@@ -510,7 +510,7 @@
             </para>
             <para>
                 For your BSP, you typically want to use an existing Yocto Project kernel found in the 
-                <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#yocto-project-files'>Yocto 
+                <ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-files'>Yocto 
                 Project Files</ulink> at <filename>meta/recipes-kernel/linux</filename>.
                 You can append your specific changes to the kernel recipe by using a
                 similarly named append file, which is located in BSP Layer (e.g. 
@@ -626,7 +626,7 @@
                 The configuration options will likely end up in that location anyway if the BSP gets 
                 added to the Yocto Project. 
                 For an example showing how to change the BSP configuration, see the
-                "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#changing-the-bsp-configuration'>Changing the BSP Configuration</ulink>" section 
+                "<ulink url='&YOCTO_DOCS_DEV_URL;#changing-the-bsp-configuration'>Changing the BSP Configuration</ulink>" section 
                 in the Yocto Project Development Manual.</para>
                 <para>
                 In general, however, the Yocto Project maintainers take care of moving the 
@@ -670,7 +670,7 @@
             <para>
               For cases where you can substitute something and still maintain functionality, 
               the Yocto Project website's  
-              <ulink url='http://www.yoctoproject.org/download/all?keys=&amp;download_type=1&amp;download_version='>BSP Download Page</ulink> 
+              <ulink url='&YOCTO_HOME_URL;/download/all?keys=&amp;download_type=1&amp;download_version='>BSP Download Page</ulink> 
               makes available 'de-featured' BSPs that are completely free of any IP encumbrances.
               For these cases you can use the substitution directly and without any further licensing
               requirements.  
@@ -757,7 +757,7 @@
                 <para>
                   Get a full-featured BSP recipe rather than a key.
                   You can do this by visiting the Yocto Project website's
-                  <ulink url='http://www.yoctoproject.org/download'>Download</ulink> page and 
+                  <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page and 
                   clicking on "BSP Downloads".
                   BSP tarballs that have proprietary information can be downloaded after agreeing 
                   to licensing requirements as part of the download process.