From c65ae4383dce010ba1bcda494c703862dd085710 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 4 Oct 2013 16:33:33 -0700
Subject: dev-manual: Tweaked the source code directory paths in the examples.

(From yocto-docs rev: 01a71527d94be021714ded6cfa376b9912b6b30e)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-model.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 761ac982a5..a3e61cb6c2 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -808,19 +808,19 @@
                                 by doing the following:
                                 <orderedlist>
                                     <listitem><para>Use the Oracle JDK.
-                                        If you don't have that, go to 
+                                        If you don't have that, go to
                                         <ulink url='http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'></ulink>
                                         and download the appropriate tarball
-                                        for your development system and 
+                                        for your development system and
                                         extract it into your home directory.
                                         </para></listitem>
                                     <listitem><para>In the shell you are going
-                                        to do your work, export the location of 
+                                        to do your work, export the location of
                                         the Oracle Java as follows:
                                         <literallayout class='monospaced'>
      export PATH=~/jdk1.7.0_40/bin:$PATH
                                         </literallayout></para></listitem>
-                                </orderedlist></para></listitem>                                        
+                                </orderedlist></para></listitem>
                             <listitem><para>In the same shell, create a Git
                                 repository with:
                                 <literallayout class='monospaced'>
@@ -894,7 +894,7 @@
                                 </para></listitem>
                             <listitem><para>Click through the "Okay" buttons.
                                 </para></listitem>
-                            <listitem><para>Check the boxes 
+                            <listitem><para>Check the boxes
                                 in the installation window and complete
                                 the installation.</para></listitem>
                             <listitem><para>Restart the Eclipse IDE if
@@ -1661,7 +1661,7 @@
             For example, here is the work directory for recipes and resulting packages that are
             not device-dependent:
             <literallayout class='monospaced'>
-     ${TMPDIR}/work/${PACKAGE_ARCH}-poky-${TARGET_OS}/${PN}-${PV}-${PR}
+     ${TMPDIR}/work/${PACKAGE_ARCH}-poky-${TARGET_OS}/${PN}/${EXTENDPE}${PV}-${PR}
             </literallayout>
             Let's look at an example without variables.
             Assuming a top-level <link linkend='source-directory'>Source Directory</link>
@@ -1670,7 +1670,7 @@
             the following is the work directory for the <filename>acl</filename> recipe that
             creates the <filename>acl</filename> package:
             <literallayout class='monospaced'>
-     ~/poky/build/tmp/work/i586-poky-linux/acl-2.2.51-r3
+     ~/poky/build/tmp/work/i586-poky-linux/acl/2.2.51-r3/
             </literallayout>
         </para>
 
@@ -1678,7 +1678,7 @@
             If your resulting package is dependent on the target device,
             the work directory varies slightly:
             <literallayout class='monospaced'>
-     ${TMPDIR}/work/${MACHINE}-poky-${TARGET_OS}/${PN}-${PV}-${PR}
+     ${TMPDIR}/work/${MACHINE}-poky-${TARGET_OS}/${PN}/${EXTENDPE}${PV}-${PR}
             </literallayout>
             Again, assuming top-level Source Directory named <filename>poky</filename>
             and a default Build Directory of <filename>poky/build</filename>, the
@@ -1686,8 +1686,8 @@
             for the <filename>acl</filename> package that is being
             built for a MIPS-based device:
             <literallayout class='monospaced'>
-     ~/poky/build/tmp/work/mips-poky-linux/acl-2.2.51-r2
-     ~/poky/build/tmp/work/mips-poky-linux/acl-2.2.51-r2/acl-2.2.51
+     ~/poky/build/tmp/work/mips-poky-linux/acl/2.2.51-r2
+     ~/poky/build/tmp/work/mips-poky-linux/acl/2.2.51-r2/acl-2.2.51
             </literallayout>
         </para>
 
@@ -1701,6 +1701,7 @@
             <ulink url='&YOCTO_DOCS_REF_URL;#var-TARGET_OS'><filename>TARGET_OS</filename></ulink>,
             <ulink url='&YOCTO_DOCS_REF_URL;#var-PN'><filename>PN</filename></ulink>,
             <ulink url='&YOCTO_DOCS_REF_URL;#var-PV'><filename>PV</filename></ulink>,
+            <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTENDPE'><filename>EXTENDPE</filename></ulink>,
             and
             <ulink url='&YOCTO_DOCS_REF_URL;#var-PR'><filename>PR</filename></ulink>
             variables in the Yocto Project Reference Manual.
-- 
cgit v1.2.3-54-g00ecf