1 files changed, 27 insertions, 27 deletions

diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index c3e4f6e987..0cda17846c 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -51,8 +51,8 @@
                 If you use this method, you just get the cross-toolchain and QEMU - you do not 
                 get any of the other mentioned benefits had you run the ADT Installer script.</para></listitem>
             <listitem><para><emphasis>Use the Toolchain from within a Yocto Project Build Tree:</emphasis>
-                If you already have a Yocto Project build tree, you can build the cross-toolchain 
-                within tree.
+                If you already have a build directory, you can build the cross-toolchain 
+                within that structure.
                 However, like the previous method mentioned, you only get the cross-toolchain and QEMU - you 
                 do not get any of the other benefits without taking separate steps.</para></listitem>
         </itemizedlist>
@@ -75,22 +75,21 @@
                 <ulink url='&YOCTO_DL_URL;/releases'>Index of Releases</ulink>, specifically
                 at  
                 <ulink url='&YOCTO_ADTINSTALLER_DL_URL;'></ulink>.
-                Or, you can use BitBake to generate the tarball inside the existing Yocto Project 
-                build tree.
+                Or, you can use BitBake to generate the tarball inside the existing build directory.
             </para>
 
             <para>
                 If you use BitBake to generate the ADT Installer tarball, you must 
-                <filename>source</filename> the Yocto Project environment setup script 
+                <filename>source</filename> the environment setup script 
                 (<filename>oe-init-build-env</filename>) located 
-                in the Yocto Project file structure before running the <filename>bitbake</filename>
+                in the source directory before running the <filename>bitbake</filename>
                 command that creates the tarball.
             </para>
 
             <para>
-                The following example commands download the Yocto Project release tarball, set up the Yocto 
-                Project files structure, set up the environment while also creating the 
-                default Yocto Project build tree, 
+                The following example commands download the Yocto Project release tarball, set up the 
+                source directory, set up the environment while also creating the 
+                default build directory, 
                 and run the <filename>bitbake</filename> command that results in the tarball 
                 <filename>~/yocto-project/build/tmp/deploy/sdk/adt_installer.tar.bz2</filename>:
                 <literallayout class='monospaced'>
@@ -151,7 +150,7 @@
                         or not to install the emulator QEMU.</para></listitem>
                     <listitem><para><filename>YOCTOADT_NFS_UTIL</filename>: Indicates whether 
                         or not to install user-mode NFS.  
-                        If you plan to use the Yocto Eclipse IDE plug-in against QEMU, 
+                        If you plan to use the Eclipse IDE Yocto plug-in against QEMU, 
                         you should install NFS.
                         <note>To boot QEMU images using our userspace NFS server, you need 
                             to be running <filename>portmap</filename> or <filename>rpcbind</filename>. 
@@ -244,17 +243,17 @@
      poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.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.
+                        if you have a build directory.
                         If you need GMAE, you should use the <filename>bitbake meta-toolchain-gmae</filename>
                         command. 
                         The resulting tarball will support such development.
                         However, if you are not concerned with GMAE, 
                         you can generate the tarball using <filename>bitbake meta-toolchain</filename>.</para>
                         <para>Use the appropriate <filename>bitbake</filename> command only after you have 
-                        sourced the <filename>oe-build-init-env</filename> script located in the Yocto 
-                        Project files.  
+                        sourced the <filename>oe-build-init-env</filename> script located in the source
+                        directory.  
                         When the <filename>bitbake</filename> command completes, the tarball will 
-                        be in <filename>tmp/deploy/sdk</filename> in the Yocto Project build tree.
+                        be in <filename>tmp/deploy/sdk</filename> in the build directory.
                         </para></note></para></listitem>
                 <listitem><para>Make sure you are in the root directory with root privileges and then expand 
                     the tarball.  
@@ -267,11 +266,11 @@
     </section>
 
     <section id='using-the-toolchain-from-within-the-build-tree'>
-        <title>Using BitBake and the Yocto Project Build Tree</title>
+        <title>Using BitBake and the Build Directory</title>
 
         <para>
             A final way of making the cross-toolchain available is to use BitBake 
-            to generate the toolchain within an existing Yocto Project build tree.
+            to generate the toolchain within an existing build directory.
             This method does not install the toolchain into the 
             <filename>/opt</filename> directory.
             As with the previous method, if you need to install the target sysroot, you must 
@@ -282,12 +281,12 @@
             Follow these steps to generate the toolchain into the build tree:
             <orderedlist>
                 <listitem><para>Source the environment setup script 
-                    <filename>oe-init-build-env</filename> located in the Yocto Project
-                    files.</para></listitem> 
+                    <filename>oe-init-build-env</filename> located in the source directory.
+                    </para></listitem> 
                 <listitem><para>At this point, you should be sure that the 
                     <filename>MACHINE</filename> variable 
                     in the <filename>local.conf</filename> file found in the 
-                    <filename>conf</filename> directory of the Yocto Project build directory
+                    <filename>conf</filename> directory of the build directory
                     is set for the target architecture.
                     Comments within the <filename>local.conf</filename> file list the values you 
                     can use for the <filename>MACHINE</filename> variable.  
@@ -305,9 +304,9 @@
                         after checking or editing the <filename>local.conf</filename> but without 
                         changing out of your working directory.</note>
                     Once the <filename>bitbake</filename> command finishes, 
-                    the cross-toolchain is generated and populated within the Yocto Project build tree.
+                    the cross-toolchain is generated and populated within the build directory.
                     You will notice environment setup files for the cross-toolchain in the 
-                    Yocto Project build tree in the <filename>tmp</filename> directory.
+                    build directory in the <filename>tmp</filename> directory.
                     Setup script filenames contain the strings <filename>environment-setup</filename>.
                     </para></listitem>
             </orderedlist>
@@ -325,7 +324,7 @@
         then you can find this script in the <filename>&YOCTO_ADTPATH_DIR;</filename>
         directory.  
         If you installed the toolchain in the build tree, you can find the environment setup 
-        script for the toolchain in the Yocto Project build tree's <filename>tmp</filename> directory.
+        script for the toolchain in the build directory's <filename>tmp</filename> directory.
     </para>
 
     <para> 
@@ -363,14 +362,15 @@
         </para>
 
         <para> 
-            The Yocto Project provides basic kernel and filesystem images for several 
+            The Yocto Project ships basic kernel and filesystem images for several 
             architectures (<filename>x86</filename>, <filename>x86-64</filename>, 
             <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 
+            These kernel images reside in the release 
             area - <ulink url='&YOCTO_MACHINES_DL_URL;'></ulink>
-            and are ideal for experimentation within Yocto Project.
-            For information on the image types you can build using the Yocto Project, see the
+            and are ideal for experimentation using Yocto Project.
+            For information on the image types you can build using the OpenEmbedded build system, 
+            see the
             "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" appendix in  
             The Yocto Project Reference Manual.
         </para>
@@ -389,7 +389,7 @@
             you can do so one of two ways:
             <itemizedlist>
                 <listitem><para>Modify the <filename>conf/local.conf</filename> configuration in 
-                    the Yocto Project build directory and then rebuild the image.
+                    the 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. 
                     Once the image is rebuilt, the <filename>tcf-agent</filename> will be included