1 files changed, 11 insertions, 10 deletions

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 58e725258e..76a0423f65 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>
@@ -231,7 +232,7 @@
             still defined so you can use commands such as <filename>configure</filename> and 
             <filename>make</filename>. 
             The commands execute just as if the Yocto Project build system were executing them. 
-            Consequently, workng this way can be helpful when debugging a build or preparing 
+            Consequently, working this way can be helpful when debugging a build or preparing 
             software to be used with the Yocto Project build system.
         </para>
 
@@ -262,7 +263,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> 
@@ -284,7 +285,7 @@
 
         <para>
             Because an external shell is launched rather than opening directly into the 
-            original terminal window, it allows easier interaction with Bitbake's multiple 
+            original terminal window, it allows easier interaction with BitBake's multiple
             threads as well as accomodates a future client/server split.
         </para>
 
@@ -294,7 +295,7 @@
             instead of just using <filename>gcc</filename>.
             The same applies to other applications such as <filename>binutils</filename>, 
             <filename>libtool</filename> and so forth.
-            The Yocto Project has setup environment variables such as <filename>CC</filename>
+            BitBake sets up environment variables such as <filename>CC</filename>
             to assist applications, such as <filename>make</filename> to find the correct tools.</para>
             <para>It is also worth noting that <filename>devshell</filename> still works over
             X11 forwarding and similar situations</para>
@@ -333,7 +334,7 @@
         It also allows you to perform post-mortem style analysis of program crashes. 
         GDB is available as a package within the Yocto Project and by default is 
         installed in sdk images.
-        See <xref linkend='ref-images'>Reference: Images</xref> for a description of these
+        See the "<link linkend='ref-images'>Reference: Images</link>" appendix for a description of these
         images. 
         You can find information on GDB at <ulink url="http://sourceware.org/gdb/"/>.
     </para>
@@ -671,7 +672,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>
@@ -679,7 +680,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>
 
@@ -765,8 +766,8 @@
                 is not always necessary to actually have them on the device for OProfile use. 
                 All that is needed is a copy of the filesystem with the debug symbols present 
                 on the viewer system. 
-                The <link linkend='platdev-gdb-remotedebug-launch-gdb'>Launching GDB
-                on the Host Computer</link> section covers how to create such a directory with 
+                The "<link linkend='platdev-gdb-remotedebug-launch-gdb'>Launching GDB on the Host Computer</link>"
+                section covers how to create such a directory with 
                 the Yocto Project and how to use the OProfileUI Settings dialog to specify the location.
                 If you specify the directory, it will be used when the file checksums 
                 match those on the system you are profiling.