8 files changed, 16 insertions, 18 deletions

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index f6861ed5aa..934b88efd1 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -203,8 +203,7 @@
         <para>
             It is useful when making changes directly to the work directory files to do
             so using the Quilt tool as detailed in the 
-            <link linkend='usingpoky-modifying-packages-quilt'> 
-            Modifying Package Source Code with Quilt</link> section. 
+            "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-modifying-packages-quilt'>Modifying Package Source Code with Quilt</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.
         </para>
diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index 1f4448d463..a526f619b8 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -138,9 +138,8 @@
         <answer>
             <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
-                earlier in this manual.
+                For information on how to add a package, see the section
+                "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-extend-addpkg'>Adding a Package</ulink>" in the Yocto Project Development Manual.
             </para>
         </answer>
     </qandaentry>
diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 364326b97f..016ddc827b 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -36,10 +36,6 @@
                 followed by information about debugging images created in the Yocto Project.
                 </para></listitem>
             <listitem><para><emphasis>
-                <link linkend='extendpoky'>Extending the Yocto Project</link>:</emphasis> This chapter
-                provides information about how to extend and customize the Yocto Project 
-                along with advice on how to manage these changes.</para></listitem>
-            <listitem><para><emphasis>
                 <link linkend='technical-details'>Technical Details</link>:</emphasis> 
                 This chapter describes fundamental Yocto Project components as well as an explanation
                 behind how the Yocto Project uses shared state (sstate) cache to speed build time.
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index 6b058008fc..ffdda431f5 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -86,7 +86,7 @@
             <filename>meta/recipes-*/</filename> directory within Poky. 
             Adding extra content to <filename>BBFILES</filename> is best achieved through the use of 
             BitBake layers as described in the 
-            <link linkend='usingpoky-changes-layers'>BitBake Layers</link> section.
+            "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-changes-layers'>BitBake Layers</ulink>" section of the Yocto Project Development Manual.
         </para>
 
         <para>
diff --git a/documentation/poky-ref-manual/ref-classes.xml b/documentation/poky-ref-manual/ref-classes.xml
index fbdd0787b0..9eb0901aff 100644
--- a/documentation/poky-ref-manual/ref-classes.xml
+++ b/documentation/poky-ref-manual/ref-classes.xml
@@ -48,10 +48,11 @@
         and <filename>libtool</filename>) bring standardization. 
         This class defines a set of tasks (configure, compile etc.) that 
         work for all Autotooled packages.  
-        It should usually be enough to define a few standard variables as documented in the 
-        <link linkend='usingpoky-extend-addpkg-autotools'>Autotooled Package</link> section 
-        and then simply <filename>inherit autotools</filename>. 
+        It should usually be enough to define a few standard variables 
+        and then simply <filename>inherit autotools</filename>.
         This class can also work with software that emulates Autotools.
+        For more information, see the  
+        "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-extend-addpkg-autotools'>Autotooled Package</ulink>" section in the Yocto Project Development Manual.
     </para>
 
     <para>
diff --git a/documentation/poky-ref-manual/ref-structure.xml b/documentation/poky-ref-manual/ref-structure.xml
index 6c502a73dd..f35e2d7400 100644
--- a/documentation/poky-ref-manual/ref-structure.xml
+++ b/documentation/poky-ref-manual/ref-structure.xml
@@ -388,8 +388,8 @@
             referred to as <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, is created.  
             Within this directory, the source is unpacked to 
             <filename>linux-qemux86-standard-build</filename> and then patched by Quilt 
-            (see the <link linkend="usingpoky-modifying-packages-quilt">Modifying Package Source Code
-            With Quilt</link> section).   
+            (see the 
+            "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-modifying-packages-quilt'>Modifying Package Source Code with Quilt</ulink>" section in the Yocto Project Development Manual.   
             Within the <filename>linux-qemux86-standard-build</filename> directory, 
             standard Quilt directories <filename>linux-3.0/patches</filename>
             and <filename>linux-3.0/.pc</filename> are created,
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index d526981a1e..529c5ec597 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -375,8 +375,9 @@
         <glossentry id='var-DISTRO_PN_ALIAS'><glossterm>DISTRO_PN_ALIAS</glossterm>
             <glossdef>
                 <para>Alias names used for the recipe in various Linux distributions.</para>
-                <para>See <link linkend='usingpoky-configuring-DISTRO_PN_ALIAS'>
-                    Handling a Package Name Alias</link> section for more information.</para>
+                <para>See the section 
+                    "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-configuring-DISTRO_PN_ALIAS'>Handling a Package Name Alias</ulink>" in the Yocto Project Development Manual
+                    for more information.</para>
             </glossdef>
         </glossentry>
 
diff --git a/documentation/poky-ref-manual/technical-details.xml b/documentation/poky-ref-manual/technical-details.xml
index 965d967b05..833b355336 100644
--- a/documentation/poky-ref-manual/technical-details.xml
+++ b/documentation/poky-ref-manual/technical-details.xml
@@ -39,7 +39,9 @@
 
     <para> 
         BitBake knows how to combine multiple data sources together and refers to each data source
-        as a "<link linkend='usingpoky-changes-layers'>layer</link>".
+        as a layer.
+        For information on layers, see the 
+        "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#usingpoky-changes-layers'>BitBake Layers</ulink>" section of the Yocto Project Development Manual.
     </para>
 
     <para>