1 files changed, 16 insertions, 15 deletions

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index c2a9cf7f41..cf396dff3d 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.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="platdev">
 <title>Platform Development with the Yocto Project</title>
@@ -82,7 +83,7 @@
             The current release of the Yocto Project no longer supports the Anjuta plug-in.
             However, the Poky Anjuta Plug-in is available to download directly from the Poky 
             Git repository located through the web interface at
-            <ulink url="http://git.yoctoproject.org/"></ulink> under IDE Plugins.
+            <ulink url='&YOCTO_GIT_URL;'></ulink> under IDE Plugins.
             The community is free to continue supporting it beyond the Yocto Project 0.9
             Release.            
         </note>
@@ -91,8 +92,8 @@
             with other plug-ins installed into the Eclipse IDE.
             Once you have your environment setup you need to configure the Eclipse plug-in.
             For information on how to install and configure the Eclipse plug-in, see the
-            "<ulink url='http://www.yoctoproject.org/docs/latest/adt-manual/adt-manual.html#adt-eclipse'>Working Within Eclipse</ulink>"
-            chapter in The Yocto Project Application Development Toolkit (ADT) User's Guide.
+            "<ulink url='&YOCTO_DOCS_ADT_URL;#adt-eclipse'>Working Within Eclipse</ulink>"
+            chapter in the Yocto Project Application Development Toolkit (ADT) User's Guide.
          </para>
          </section>
 
@@ -100,8 +101,8 @@
         <title>External Development Using the QEMU Emulator</title>
         <para>
             Running Poky QEMU images is covered in the 
-            "<ulink url='http://www.yoctoproject.org/docs/latest/yocto-project-qs/yocto-project-qs.html#test-run'>A Quick Test Run</ulink>"
-            section of The Yocto Project Quick Start.
+            "<ulink url='&YOCTO_DOCS_QS_URL;#test-run'>A Quick Test Run</ulink>"
+            section of the Yocto Project Quick Start.
         </para>
         <para>
             The QEMU images shipped with the Yocto Project contain complete toolchains
@@ -160,8 +161,8 @@
         <para>
             Working directly with the Yocto Project is a fast and effective development technique.
             The idea is that you can directly edit files in a working directory
-            (<glossterm><link linkend='var-WORKDIR'>WORKDIR</link></glossterm>) 
-            or the source directory (<glossterm><link linkend='var-S'>S</link></glossterm>) 
+            (<filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>) 
+            or the source directory (<filename><link linkend='var-S'>S</link></filename>) 
             and then force specific tasks to rerun in order to test the changes. 
             An example session working on the matchbox-desktop package might 
             look like this:
@@ -201,9 +202,9 @@
         <para>
             It is useful when making changes directly to the work directory files to do
             so using the Quilt tool as detailed in the 
-            "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#using-a-quilt-workflow'>Using a Quilt Workflow</ulink>" section in the Yocto Project Development Manual. 
+            "<ulink url='&YOCTO_DOCS_DEV_URL;#using-a-quilt-workflow'>Using a Quilt Workflow</ulink>" section in the Yocto Project Development Manual. 
             Using Quilt, you can copy patches into the recipe directory and use the patches directly 
-            through use of the <glossterm><link linkend='var-SRC_URI'>SRC_URI</link></glossterm> variable.
+            through use of the <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename> variable.
         </para>
 
         <para>
@@ -258,7 +259,7 @@
             or <filename>compile</filename> commands as if they were being run by 
             the Yocto Project build system itself.
             As noted earlier, the working directory also automatically changes to the 
-            source directory (<glossterm><link linkend='var-S'>S</link></glossterm>).
+            source directory (<filename><link linkend='var-S'>S</link></filename>).
         </para>
 
         <para> 
@@ -268,8 +269,8 @@
         <para>
             The default shell used by <filename>devshell</filename> is xterm. 
             You can use other terminal forms by setting the 
-            <glossterm><link linkend='var-TERMCMD'>TERMCMD</link></glossterm> and 
-            <glossterm><link linkend='var-TERMCMDRUN'>TERMCMDRUN</link></glossterm> variables 
+            <filename><link linkend='var-TERMCMD'>TERMCMD</link></filename> and 
+            <filename><link linkend='var-TERMCMDRUN'>TERMCMDRUN</link></filename> variables 
             in the Yocto Project's <filename>local.conf</filename> file found in the build
             directory. 
             For examples of the other options available, see the "UI/Interaction Configuration"
@@ -667,7 +668,7 @@
         <para>
             A graphical user interface for OProfile is also available. 
             You can download and build this interface from the Yocto Project at
-            <ulink url="http://git.yoctoproject.org/cgit.cgi/oprofileui/"></ulink>. 
+            <ulink url="&YOCTO_GIT_URL;/cgit.cgi/oprofileui/"></ulink>. 
             If the "tools-profile" image feature is selected, all necessary binaries
             are installed onto the target device for OProfileUI interaction.
         </para>
@@ -675,7 +676,7 @@
         <para>
             Even though the Yocto Project usually includes all needed patches on the target device, you 
             might find you need other OProfile patches for recent OProfileUI features.
-            If so, see the <ulink url='http://git.yoctoproject.org/cgit.cgi/oprofileui/tree/README'>
+            If so, see the <ulink url='&YOCTO_GIT_URL;/cgit.cgi/oprofileui/tree/README'>
             OProfileUI README</ulink> for the most recent information.
         </para>