diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
index eb2de9b673..74c00c498c 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml
+++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
@@ -88,9 +88,11 @@
         <title>The Directory for Cloning Layers</title>
 
         <para>
-            If you are running Toaster in Build Mode, Toaster creates
-            a <filename>_toaster_clones</filename> directory inside
-            your Source Directory (i.e. <filename>poky</filename>).
+            If you are running Toaster in
+            <link linkend='toaster-build-mode'>Build Mode</link>,
+            Toaster creates a <filename>_toaster_clones</filename>
+            directory inside your Source Directory
+            (i.e. <filename>poky</filename>).
             For example, suppose you use this command to start Toaster:
             <literallayout class='monospaced'>
      poky/bitbake/bin/toaster
@@ -115,15 +117,16 @@
         <title>The Build Directory</title>
 
         <para>
-            If you are running Toaster in Build Mode, Toaster creates a
-            build directory within your Source Directory (e.g.
-            <filename>poky</filename>).
+            If you are running Toaster in
+            <link linkend='toaster-build-mode'>Build Mode</link>,
+            Toaster creates a build directory within your Source
+            Directory (e.g. <filename>poky</filename>).
             For example, suppose you use this command to start Toaster:
             <literallayout class='monospaced'>
      poky/bitbake/bin/toaster
             </literallayout>
             In this example, Toaster creates and uses the
-            <filename>poky/_toaster_clones</filename>
+            <filename>poky/build</filename>
             directory to execute the builds.
         </para>
 
@@ -141,7 +144,8 @@
         <title>Creating a Django Superuser</title>
 
         <para>
-            Toaster is built on the Django framework.
+            Toaster is built on the
+            <ulink url='https://www.djangoproject.com/'>Django framework</ulink>.
             Django provides an administration interface you can use
             to edit Toaster configuration parameters.
         </para>
@@ -382,8 +386,15 @@
                         </para>
 
                         <para>
-                            The <filename>lsupdates</filename> command fetches the
-                            initial recipes and layers data from the layer index.
+                            The <filename>lsupdates</filename> command fetches
+                            information about machines, recipes and
+                            layers available as part of OpenEmbedded.
+                            The information is fetched from the
+                            <ulink url='http://layers.openembedded.org/'>OpenEmbedded Metadata Index</ulink>.
+                            This information provides easy access to metadata
+                            from Toaster, and it is key for Toaster's usability.
+                            It is not recommended that you use Toaster without
+                            fetching this information."
                         </para>
 
                         <para>
@@ -1336,17 +1347,17 @@
             <para>
                 Following are several videos that show how to use the Toaster GUI:
                 <itemizedlist>
+                    <listitem><para><emphasis>Build Configuration:</emphasis>
+                        This
+                        <ulink url='https://www.youtube.com/watch?v=qYgDZ8YzV6w'>video</ulink>
+                        overviews and demonstrates build configuration for Toaster.
+                        </para></listitem>
                     <listitem><para><emphasis>Build Custom Layers:</emphasis>
                         This
                         <ulink url='https://www.youtube.com/watch?v=QJzaE_XjX5c'>video</ulink>
                         shows you how to build custom layers that are used with
                         Toaster.
                         </para></listitem>
-                    <listitem><para><emphasis>Build Configuration:</emphasis>
-                        This
-                        <ulink url='https://www.youtube.com/watch?v=qYgDZ8YzV6w'>video</ulink>
-                        overviews and demonstrates build configuration for Toaster.
-                        </para></listitem>
                     <listitem><para><emphasis>Toaster Homepage and Table Controls:</emphasis>
                         This
                         <ulink url='https://www.youtube.com/watch?v=QEARDnrR1Xw'>video</ulink>