diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml
index 74d5406f4b..4d4bc0102b 100644
--- a/documentation/dev-manual/dev-manual-bsp-appendix.xml
+++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml
@@ -161,11 +161,11 @@
         <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the 
         Yocto Project website. 
         Here is the specific link for the tarball needed for this example:
-        <ulink url='&YOCTO_MACHINES_DL_URL;/crownbay-noemgd/crownbay-noemgd-&DISTRO_NAME;-&POKYVERSION;.tar.bz2'></ulink>.
+        <ulink url='&YOCTO_DL_URL;/releases/yocto/yocto-1.1/machines/crownbay-noemgd/crownbay-noemgd-edison-6.0.0.tar.bz2'></ulink>.
         Again, be sure that you are already in the <filename>poky</filename> directory
         as described previously before installing the tarball:
         <literallayout class='monospaced'>
-     $ tar xfj crownbay-noemgd-&DISTRO_NAME;-&POKYVERSION;.tar.bz2
+     $ tar xfj crownbay-noemgd-&DISTRO_NAME;-6.0.0.tar.bz2
      $ cd meta-intel
         </literallayout> 
     </para>
diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index b9a63225ab..0728753358 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -18,7 +18,8 @@
             sources where you can find more detail.
             For example, detailed information on Git, repositories and open source in general
             can be found in many places.  
-            Another example is how to get set up to use the Yocto Project, which our Yocto Project Quick Start covers.
+            Another example is how to get set up to use the Yocto Project, which our 
+            <ulink url='&YOCTO_DOCS_QS_URL;'>Yocto Project Quick Start</ulink> covers.
         </para>
 
         <para>  
@@ -64,7 +65,9 @@
             <itemizedlist>
                 <listitem><para>Step-by-step instructions if those instructions exist in other Yocto 
                     Project documentation.  
-                    For example, the Application Development Toolkit (ADT) User’s Guide contains detailed 
+                    For example, the 
+                    <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Development Toolkit (ADT)
+                    User's Guide</ulink> contains detailed 
                     instruction on how to obtain and configure the 
                     <trademark class='trade'>Eclipse</trademark> Yocto Plug-in.</para></listitem>
                 <listitem><para>Reference material.  
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index bc95a20c2a..774ac3d5bf 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -171,10 +171,8 @@
             Images are the binary output that runs on specific hardware and for specific
             use cases.
             For a list of the supported image types that the Yocto Project provides, see the
-            "<ulink url='http://www.yoctoproject.org/docs/1.1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>"
-            appendix in
-            <ulink url='http://www.yoctoproject.org/docs/1.1.1/poky-ref-manual/poky-ref-manual.html'>
-            The Yocto Project Reference Manual</ulink>.</para></listitem>
+            "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>"
+            appendix in the Yocto Project Reference Manual.</para></listitem>
         <listitem><para><emphasis>Layer:</emphasis> A collection of recipes representing the core, 
             a BSP, or an application stack.</para></listitem>
         <listitem><para><emphasis>Metadata:</emphasis> The files that BitBake parses when building an image. 
@@ -217,14 +215,14 @@
             system in order to do any development using the Yocto Project.</para>
             <para>The name of the top-level directory of the Yocto Project file structure  
             is derived from the Yocto Project release tarball.
-            For example, downloading and unpacking <filename>poky-edison-6.0.1.tar.bz2</filename>
+            For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename>
             results in a Yocto Project file structure whose Yocto Project source directory is named 
-            <filename>poky-edison-6.0.1</filename>.
+            <filename>&YOCTO_POKY;</filename>.
             If you create a Git repository, then you can name the repository anything you like.</para>
             <para>You can find instruction on how to set up the Yocto Project files on your 
             host development system by reading 
             the 
-            "<ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#getting-setup'>Getting
+            "<ulink url='&YOCTO_DOCS_DEV_URL;#getting-setup'>Getting
             Setup</ulink>" section.</para></listitem>
         <listitem><para><emphasis>Yocto Project Build Directory:</emphasis>
             This term refers to the area used by the Yocto Project for builds.  
@@ -234,9 +232,9 @@
             You can create the Yocto Project build directory anywhere you want on your 
             development system.
             Here is an example that creates the directory in <filename>mybuilds</filename> 
-            and names the Yocto Project build directory <filename>YP-6.0.1</filename>:
+            and names the Yocto Project build directory <filename>YP-&POKYVERSION;</filename>:
             <literallayout class='monospaced'> 
-     $ source poky-edison-6.0.1/oe-init-build-env $HOME/mybuilds/YP-6.0.1
+     $ source &OE_INIT_PATH; $HOME/mybuilds/YP-&POKYVERSION;
             </literallayout>
             If you don't specifically name the directory, BitBake creates it 
             in the current directory and uses the name <filename>build</filename>.