2 files changed, 51 insertions, 26 deletions

diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index f8ba557f39..6900b0cd8c 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -229,8 +229,10 @@
         <title>Using a Cross-Toolchain Tarball</title>
 
         <para>
-            If you want to simply install the cross-toolchain by hand, you can
+            If you want to simply install a cross-toolchain by hand, you can
             do so by running the toolchain installer.
+            The installer includes the pre-built cross-toolchain, the
+            <filename>runqemu</filename> script, and support files.
             If you use this method to install the cross-toolchain, you
             might still need to install the target sysroot by installing and
             extracting it separately.
@@ -241,25 +243,30 @@
         <para>
             Follow these steps:
             <orderedlist>
-                <listitem><para>Get the toolchain installer using one of the
+                <listitem><para>Get your toolchain installer using one of the
                     following methods:
                     <itemizedlist>
                         <listitem><para>Go to
                             <ulink url='&YOCTO_TOOLCHAIN_DL_URL;'></ulink>
                             and find the folder that matches your host
                             development system (i.e. <filename>i686</filename>
-                            for 32-bit machines or <filename>x86-64</filename>
+                            for 32-bit machines or <filename>x86_64</filename>
                             for 64-bit machines).</para>
                             <para>Go into that folder and download the toolchain
                             installer whose name includes the appropriate target
                             architecture.
+                            The toolchains provided by the Yocto Project
+                            are based off of the
+                            <filename>core-image-sato</filename> image and
+                            contain libraries appropriate for developing
+                            against that image.
                             For example, if your host development system is a
                             64-bit x86 system and you are going to use
                             your cross-toolchain for a 32-bit x86
                             target, go into the <filename>x86_64</filename>
                             folder and download the following installer:
                             <literallayout class='monospaced'>
-     poky-eglibc-x86_64-i586-toolchain-&DISTRO;.sh
+     poky-eglibc-x86_64-core-image-sato-i586.sh
                             </literallayout></para></listitem>
                         <listitem><para>Build your own toolchain installer.
                             For cases where you cannot use an installer
@@ -278,7 +285,7 @@
                     The example assumes the toolchain installer is located
                     in <filename>~/Downloads/</filename>.
                     <literallayout class='monospaced'>
-     $ ~/Downloads/poky-eglibc-x86_64-i586-toolchain-&DISTRO;.sh
+     $ ~/Downloads/poky-eglibc-x86_64-core-image-sato-i586.sh
                     </literallayout>
                     <note>
                         If you do not have write permissions for the directory
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index a8e8c3a35a..372a86efd0 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -552,44 +552,62 @@
 
         <section id='installing-the-toolchain'>
             <title>Installing the Toolchain</title>
+
             <para>
-                You can download a tarball installer, which includes the pre-built toolchain, the
-                <filename>runqemu</filename>
+                You can download a tarball installer, which includes the
+                pre-built toolchain, the <filename>runqemu</filename>
                 script, and support files from the appropriate directory under
                 <ulink url='&YOCTO_TOOLCHAIN_DL_URL;'></ulink>.
-                Toolchains are available for 32-bit and 64-bit x86 development systems from the
-                <filename>i686</filename> and <filename>x86_64</filename> directories, respectively.
-                Each type of development system supports five target architectures.
-                The names of the tarball installer scripts are such that a string representing the
-                host system appears first in the filename and then is immediately followed by a
-                string representing the target architecture.
+                Toolchains are available for 32-bit and 64-bit x86 development
+                systems from the <filename>i686</filename> and
+                <filename>x86_64</filename> directories, respectively.
+                The toolchains the Yocto Project provides are based off the
+                <filename>core-image-sato</filename> image and contain
+                libraries appropriate for developing against that image.
+                Each type of development system supports five or more target
+                architectures.
+            </para>
+
+            <para>
+                The names of the tarball installer scripts are such that a
+                string representing the host system appears first in the
+                filename and then is immediately followed by a string
+                that represents the target architecture.
             </para>
 
             <literallayout class='monospaced'>
-     poky-eglibc-&lt;<emphasis>host_system</emphasis>&gt;-&lt;<emphasis>arch</emphasis>&gt;-toolchain-gmae-&lt;<emphasis>release</emphasis>&gt;.sh
+     poky-eglibc-&lt;<emphasis>host_system</emphasis>&gt;-&lt;<emphasis>image_type</emphasis>&gt;-&lt;<emphasis>arch</emphasis>&gt;.sh
 
      Where:
          &lt;<emphasis>host_system</emphasis>&gt; is a string representing your development system:
                 i686 or x86_64.
 
-         &lt;<emphasis>arch</emphasis>&gt; is a string representing the target architecture:
-                i586, x86_64, powerpc, mips, or arm.
+         &lt;<emphasis>image_type</emphasis>&gt; is a string representing the image you wish to
+                develop a Software Development Toolkit (SDK) for use against.
+                The Yocto Project builds toolchain installers using the
+                following BitBake command:
+
+                    bitbake core-image-sato -c do_populatesdk core-image-sato
 
-         &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project.
+         &lt;<emphasis>arch</emphasis>&gt; is a string representing the tuned target architecture:
+
+                i586, x86_64, powerpc, mips, armv7a or armv5te
             </literallayout>
 
             <para>
-                For example, the following toolchain installer is for a 64-bit development
-                host system and a 32-bit target architecture:
+                For example, the following toolchain installer is for a 64-bit
+                development host system and a i586-tuned target architecture
+                based off the SDK for <filename>core-image-sato</filename>:
+                <literallayout class='monospaced'>
+     poky-eglibc-x86_64-core-image-sato-i586.sh
+                </literallayout>
             </para>
 
-            <literallayout class='monospaced'>
-     poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.sh
-            </literallayout>
-
             <para>
-                Toolchains are self-contained and by default are installed into <filename>/opt/poky</filename>.
-                However, when you run the toolchain installer, you can choose an installation directory.
+                Toolchains are self-contained and by default are installed into
+                <filename>/opt/poky</filename>.
+                However, when you run the toolchain installer, you can choose an
+                installation directory.
             </para>
 
             <para>
@@ -610,7 +628,7 @@
 
             <para>
                 <literallayout class='monospaced'>
-     $ ~/Downloads/poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.sh
+     $ ~/Downloads/poky-eglibc-x86_64-core-image-sato-i586.sh
                 </literallayout>
             </para>