documentation/adt-manual/adt-prepare.xml: Updates for 1.1.1

These changes reflect working through the chapter using the
1.1.1 release.  Several areas needed tweaking.

(From yocto-docs rev: 566b8a492e502e88a1404f833db140a6408da592)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 27 insertions, 23 deletions

diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index b45da5f6c2..79c44849e9 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -100,7 +100,7 @@
                 a top-level directory named <filename>adt-installer</filename>:
                 <literallayout class='monospaced'>
      $ cd ~
-     $ cp ~/poky/build/tmp/deploy/sdk/adt_installer.tar.bz2 $HOME
+     $ cp ~/yocto-project/build/tmp/deploy/sdk/adt_installer.tar.bz2 $HOME
      $ tar -xjf adt_installer.tar.bz2
                 </literallayout>
                 Unpacking it creates the directory <filename>adt-installer</filename>, 
@@ -165,9 +165,10 @@
 
             <para>
                 After you have configured the <filename>adt_installer.conf</filename> file, 
-                run the installer using the following command:
+                run the installer for this example using the following commands:
                 <literallayout class='monospaced'>
-     $ adt_installer
+     $ cd ~/adt-installer
+     $ ./adt_installer
                 </literallayout>
             </para>
 
@@ -214,9 +215,9 @@
             Follow these steps:
             <orderedlist>
                 <listitem><para>Go to  
-                    <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1.1/toolchain'></ulink> 
+                    <ulink url='http://downloads.yoctoproject.org/releases/yocto/yocto-1.1.1/toolchain'></ulink> 
                     and find the folder that matches your host development system 
-                    (i.e. <filename>i586</filename> for 32-bit machines or 
+                    (i.e. <filename>i686</filename> for 32-bit machines or 
                     <filename>x86_64</filename> for 64-bit machines).</para></listitem>
                 <listitem><para>Go into that folder and download the toolchain tarball whose name 
                     includes the appropriate target architecture.
@@ -224,7 +225,7 @@
                     you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the 
                     <filename>x86_64</filename> folder and download the following tarball:
                     <literallayout class='monospaced'>
-     yocto-eglibc-x86_64-i586-toolchain-1.1.tar.bz2
+     poky-eglibc-x86_64-i586-toolchain-1.1.1.tar.bz2
                     </literallayout>
                     <note><para>As an alternative to steps one and two, you can build the toolchain tarball 
                         if you have a Yocto Project build tree.
@@ -244,6 +245,12 @@
                     The tarball expands into <filename>/opt/poky/1.1.1</filename>.
                     Once the tarball is expanded, the cross-toolchain is installed.
                     You will notice environment setup files for the cross-toolchain in the directory.
+                    Here is an example where the tarball exists in the user's <filename>Downloads</filename>
+                    directory:
+                    <literallayout class='monospaced'>
+     # cd /
+     # tar -xjf /home/scottrif/Downloads/poky-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2
+                    </literallayout>     
                     </para></listitem>
             </orderedlist>
         </para>
@@ -280,7 +287,7 @@
                         command.</note></para></listitem>
                 <listitem><para>Run <filename>bitbake meta-ide-support</filename> to complete the 
                     cross-toolchain installation.
-                    <note>If change out of your working directory after you 
+                    <note>If you change out of your working directory after you 
                         <filename>source</filename> the environment setup script and before you run
                         the <filename>bitbake</filename> command, the command might not work. 
                         Be sure to run the <filename>bitbake</filename> command immediately 
@@ -311,14 +318,14 @@
     </para>
 
     <para> 
-        Be sure to run the environment setup script that matches the architecture for 
+        Be sure to source the environment setup script that matches the architecture for 
         which you are developing.  
         Environment setup scripts begin with the string “<filename>environment-setup</filename>”
         and include as part of their name the architecture.  
-        For example, the toolchain environment setup script for a 64-bit IA-based architecture would 
-        be the following: 
+        For example, the command to source the toolchain environment setup script 
+        for a 64-bit IA-based machine would be the following: 
         <literallayout class='monospaced'>
-     /opt/poky/1.1.1/environment-setup-x86_64-poky-linux
+     $ source /opt/poky/1.1.1/environment-setup-x86_64-poky-linux
         </literallayout>
     </para>
 </section>
@@ -341,9 +348,7 @@
             pre-built versions.
             You can find examples for both these situations in the 
             "<ulink url='http://www.yoctoproject.org/docs/1.1.1/yocto-project-qs/yocto-project-qs.html#test-run'>A
-            Quick Test Run</ulink>" section of   
-            <ulink url='http://www.yoctoproject.org/docs/1.1.1/yocto-project-qs/yocto-project-qs.html'>
-            The Yocto Project Quick Start</ulink>.
+            Quick Test Run</ulink>" section of The Yocto Project Quick Start.
         </para>
 
         <para> 
@@ -352,12 +357,10 @@
             <filename>mips</filename>, <filename>powerpc</filename>, and <filename>arm</filename>) 
             that you can use unaltered in the QEMU emulator.  
             These kernel images reside in the Yocto Project release 
-            area - <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1.1/machines/'></ulink>
+            area - <ulink url='http://downloads.yoctoproject.org/releases/yocto/yocto-1.1.1/machines/'></ulink>
             and are ideal for experimentation within Yocto Project.
             For information on the image types you can build using the Yocto Project, 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>.
+            "<ulink url='http://www.yoctoproject.org/docs/1.1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>" appendix in The Yocto Project Reference Manual.
         </para>
 
         <para>
@@ -373,7 +376,7 @@
             If you want to use a different image type that contains the <filename>tcf-agent</filename>, 
             you can do so one of two ways:
             <itemizedlist>
-                <listitem><para>Modify the <filename>conf/local.conf</filename> configuration in 
+                <listitem><para>Modify the <filename>conf/local.conf</filename> configuration file in 
                     the Yocto Project build directory and then rebuild the image.
                     With this method, you need to modify the <filename>EXTRA_IMAGE_FEATURES</filename>
                     variable to have the value of "tools-debug" before rebuilding the image. 
@@ -429,16 +432,17 @@
             To extract the root filesystem, first <filename>source</filename>
             the cross-development environment setup script and then 
             use the <filename>runqemu-extract-sdk</filename> command on the 
-            filesystem image. 
-            For example, the following commands set up the environment and then extract
+            filesystem image tarball. 
+            For example, the following commands set up the environment by sourcing 
+            the setup script from within the build directory and then extracting
             the root filesystem from a previously built filesystem image tarball named  
-            <filename>core-image-sato-sdk-qemux86-2011091411831.rootfs.tar.bz2</filename>.
+            <filename>core-image-sato-sdk-qemux86.tar.bz2</filename>.
             The example extracts the root filesystem into the <filename>$HOME/qemux86-sato</filename>
             directory:
             <literallayout class='monospaced'>
      $ source $HOME/poky/build/tmp/environment-setup-i586-poky-linux
      $ runqemu-extract-sdk \
-        tmp/deploy/images/core-image-sato-sdk-qemux86-2011091411831.rootfs.tar.bz2 \
+        tmp/deploy/images/core-image-sato-sdk-qemux86.tar.bz2 \
         $HOME/qemux86-sato
             </literallayout>
             In this case, you could now point to the target sysroot at