From ce0456d95d9859477429a1208433245ae8724fd7 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 2 Sep 2011 11:51:55 -0700
Subject: [PATCH] documentation/adt-manual/adt-prepare.xml: Updates to variable
 and other edits

Updated the variable name of the adt_installer.conf file that points to
the IPKG repo.  This changed for 1.1.  Also made some small edits.

(From yocto-docs rev: 893b8b2f4bed8d4fce9a876e2184b3f5b9b004c0)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/adt-manual/adt-prepare.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index 609c334b0f..3e6b8dad17 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -143,12 +143,13 @@
                 Before running the ADT Installer script, you need to unpack the tarball.
                 You can unpack the tarball in any directory you wish.
                 Unpacking it creates the directory <filename>adt-installer</filename>, 
-                which contains the ADT Installer script and its configuration file.
+                which contains the ADT Installer script (<filename>adt_installer</filename>)
+                and its configuration file (<filename>adt_installer.conf</filename>).
             </para>
 
             <para>
                 Before you run the script, however, you should examine the ADT Installer configuration 
-                file (<filename>adt_installer</filename>) and be sure you are going to get what you want.  
+                file and be sure you are going to get what you want.  
                 Your configurations determine which kernel and filesystem image are downloaded.
             </para>
 
@@ -158,15 +159,15 @@
                 the <filename>adt-installer.conf</filename> file:
 
                 <itemizedlist>
-                    <listitem><para><filename>YOCTOADT_IPKG_REPO</filename>: This area 
+                    <listitem><para><filename>YOCTOADT_REPO</filename>: This area 
                         includes the IPKG-based packages and the root filesystem upon which 
                         the installation is based.  
                         If you want to set up your own IPKG repository pointed to by 
-                        <filename>YOCTOADT_IPKG_REPO</filename>, you need to be sure that the 
+                        <filename>YOCTOADT_REPO</filename>, you need to be sure that the 
                         directory structure follows the same layout as the reference directory 
                         set up at <ulink url='http://adtrepo.yoctoproject.org'></ulink>.  
                         Also, your repository needs to be accessible through HTTP.</para></listitem>
-                    <listitem><para><filename>YOCTOADT-TARGETS</filename>: The machine 
+                    <listitem><para><filename>YOCTOADT_TARGETS</filename>: The machine 
                         target architectures for which you want to set up cross-development 
                         environments.</para></listitem>
                     <listitem><para><filename>YOCTOADT_QEMU</filename>: Indicates whether 
@@ -263,15 +264,15 @@
                     <literallayout class='monospaced'>
      yocto-eglibc-x86_64-arm-toolchain-gmae-1.1.tar.bz2
                    </literallayout>
-                    <note>Alternatively, you can build the toolchain tarball if you have a Yocto 
-                        Project build tree.
+                    <note>As an alternative to steps one and two, you can build the toolchain tarball 
+                        if you have a Yocto Project build tree.
                         Use the <filename>bitbake meta-toolchain</filename> command after you have 
                         sourced the <filename>oe-build-init script</filename> located in the Yocto 
                         Project files.  
                         When the <filename>bitbake</filename> command completes, the toolchain tarball will 
                         be in <filename>tmp/deploy/sdk</filename> in the Yocto Project build tree.
                         </note></para></listitem>
-                <listitem><para>Make sure you are in the root directory and then expand 
+                <listitem><para>Make sure you are in the root directory with root privileges and then expand 
                     the tarball.  
                     The tarball expands into <filename>/opt/poky/$SDKVERSION</filename>.
                     Once the tarball in unpacked, the cross-toolchain is installed.