1 files changed, 16 insertions, 15 deletions

diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index 669b2d5aa5..61853b5120 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.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; ] >
 
 <appendix id='faq'>
 <title>FAQ</title>
@@ -7,13 +8,13 @@
     <qandaentry>
         <question>
             <para>
-                How does Poky differ from <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>?
+                How does Poky differ from <ulink url='&OE_HOME_URL;'>OpenEmbedded</ulink>?
             </para>
         </question>
         <answer>
             <para>
                 Poky is the Yocto Project build system that was derived from <ulink 
-                url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
+                url='&OE_HOME_URL;'>OpenEmbedded</ulink>.
                 Poky is a stable, smaller subset focused on the mobile environment. 
                 Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
                 features being merged regularly between the two for mutual benefit.
@@ -33,8 +34,8 @@
                 You can use a stand-alone tarball to provide Python 2.6.
                 You can find pre-built 32 and 64-bit versions of Python 2.6 at the following locations:
                 <itemizedlist>
-                    <listitem><para><ulink url='http://downloads.yoctoproject.org/releases/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-i686.tar.bz2'>32-bit tarball</ulink></para></listitem>
-                    <listitem><para><ulink url='http://downloads.yoctoproject.org/releases/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-x86_64.tar.bz2'>64-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='&YOCTO_PYTHON-i686_DL_URL;'>32-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='&YOCTO_PYTHON-x86_64_DL_URL;'>64-bit tarball</ulink></para></listitem>
                 </itemizedlist>
             </para>
             <para>
@@ -139,7 +140,7 @@
             <para>
                 To add a package, you need to create a BitBake recipe.
                 For information on how to add a package, see the 
-                <link linkend='usingpoky-extend-addpkg'>Adding a Package</link> section
+                "<link linkend='usingpoky-extend-addpkg'>Adding a Package</link>" section
                 earlier in this manual.
             </para>
         </answer>
@@ -171,7 +172,7 @@
         </question>
         <answer>
             <para>
-                <ulink url='http://www.gnome.org/mobile/'>GNOME Mobile</ulink> is a subset of the GNOME 
+                GNOME Mobile is a subset of the <ulink url='http://www.gnome.org'>GNOME</ulink> 
                 platform targeted at mobile and embedded devices. 
                 The the main difference between GNOME Mobile and standard GNOME is that 
                 desktop-orientated libraries have been removed, along with deprecated libraries, 
@@ -385,9 +386,9 @@
         </question>
         <answer>
             <para>
-                You need to create a form factor file as described in 
-                <xref linkend='bsp-filelayout-misc-recipes'>"Miscellaneous Recipe Files"</xref>
-                and set the <filename>HAVE_TOUCHSCREEN</filename> variable equal to one as follows:
+                You need to create a form factor file as described in the
+                "<link linkend='bsp-filelayout-misc-recipes'>Miscellaneous Recipe Files</link>"
+                section and set the <filename>HAVE_TOUCHSCREEN</filename> variable equal to one as follows:
                 <literallayout class='monospaced'>
      HAVE_TOUCHSCREEN=1
                 </literallayout>
@@ -407,8 +408,8 @@
                 automatically bring up network interfaces. 
                 Therefore, you will need to add a BSP-specific netbase that includes an interfaces 
                 file.
-                See <xref linkend='bsp-filelayout-misc-recipes'>"Miscellaneous Recipe Files"</xref>
-                for information on creating these types of miscellaneous recipe files.
+                See the "<link linkend='bsp-filelayout-misc-recipes'>Miscellaneous Recipe Files</link>"
+                section for information on creating these types of miscellaneous recipe files.
             </para>
             <para>
                 For example, add the following files to your layer:
@@ -493,8 +494,8 @@
 
     <qandaentry>
         <question>
-            <para>
-                How does the Yocto Project obtain source code and will it work behind my 
+            <para id='how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>
+                How does the Yocto Project build system obtain source code and will it work behind my 
                 firewall or proxy server?
             </para>
         </question>
@@ -573,7 +574,7 @@
                  any network accesses to anything other than the PREMIRROR would fail.
              </para>
              <para>
-                 Poky also honors the standard environment variables 
+                 Poky also honors the standard shell environment variables 
                  <filename>http_proxy</filename>, <filename>ftp_proxy</filename>, 
                  <filename>https_proxy</filename>, and <filename>all_proxy</filename>
                  to redirect requests through proxy servers.