diff --git a/documentation/poky.ent b/documentation/poky.ent
index 1ae0617d71..1cc9fab6b9 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -50,6 +50,7 @@
 <!ENTITY YOCTO_DOCS_KERNEL_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/kernel-manual/kernel-manual.html">
 <!ENTITY YOCTO_DOCS_KERNEL_DEV_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/kernel-dev/kernel-dev.html">
 <!ENTITY YOCTO_DOCS_PROF_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/profile-manual/profile-manual.html">
+<!ENTITY YOCTO_DOCS_BB_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/user-manual/user-manual.html">
 <!ENTITY YOCTO_ADTPATH_DIR "/opt/poky/&DISTRO;">
 <!ENTITY YOCTO_POKY_TARBALL "&YOCTO_POKY;.tar.bz2">
 <!ENTITY OE_INIT_PATH "&YOCTO_POKY;/oe-init-build-env">
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 77292d676b..e99a63726a 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -518,9 +518,11 @@
              Continue with the following command to build an OS image for the target, which is
              <filename>core-image-sato</filename> in this example.
              For information on the <filename>-k</filename> option use the
-             <filename>bitbake --help</filename> command or see the
-             "<ulink url='&YOCTO_DOCS_REF_URL;#usingpoky-components-bitbake'>BitBake</ulink>" section in
-             the Yocto Project Reference Manual.
+             <filename>bitbake --help</filename> command, see the
+             "<ulink url='&YOCTO_DOCS_REF_URL;#usingpoky-components-bitbake'>BitBake</ulink>"
+             section in the Yocto Project Reference Manual, or see the
+             "<ulink url='&YOCTO_DOCS_BB_URL;#user-manual-command'>BitBake Command</ulink>"
+             section in the BitBake User Manual.
              <literallayout class='monospaced'>
      $ bitbake -k core-image-sato
              </literallayout>
@@ -534,12 +536,16 @@
              <literallayout class='monospaced'>
      $ runqemu qemux86
              </literallayout>
-             <note><para>
-                 Depending on the number of processors and cores, the amount or RAM, the speed of your
-                 Internet connection and other factors, the build process could take several hours the first
-                 time you run it.
-                 Subsequent builds run much faster since parts of the build are cached.
-             </para></note>
+             <note>
+                 <para>
+                     Depending on the number of processors and cores, the amount
+                     of RAM, the speed of your Internet connection and other
+                     factors, the build process could take several hours the
+                     first time you run it.
+                     Subsequent builds run much faster since parts of the build
+                     are cached.
+                 </para>
+             </note>
          </para>
     </section>
 
@@ -598,7 +604,7 @@
                 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.
+                representing the target architecture.
             </para>
 
             <literallayout class='monospaced'>
@@ -813,9 +819,10 @@
                 pages.
             </para>
         </footnote>
-        gives you a minimal description of how to use the Yocto Project to build images
-        for a BeagleBoard xM starting from scratch.
-        The steps were performed on a 64-bit Ubuntu 12.04 system.
+        gives you a minimal description of how to use the Yocto Project to build
+        images for a BeagleBoard xM starting from scratch.
+        The steps were performed on a 64-bit Ubuntu 12.04 system that
+        has four cores.
     </para>
 
     <section id='getting-yocto'>
@@ -824,7 +831,7 @@
         <para>
             Set up your
             <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
-            by using Git to clone the <filename>poky</filename> poky
+            by using Git to clone the <filename>poky</filename>
             repository and then check out the release branch:
             <literallayout class='monospaced'>
      $ cd ~
@@ -860,7 +867,7 @@
             </literallayout>
             At this point, the <filename>mybuilds</filename> directory has
             been created for you and it is now your current working directory.
-            If you don't provide your own directory name,
+            If you do not provide your own directory name,
             it defaults to <filename>build</filename>,
             which is inside the Source Directory.
         </para>
@@ -970,6 +977,11 @@
             Once you have your image, you can take steps to load and boot it on
             the target hardware.
         </para>
+
+        <para>
+            You can learn about BitBake in general by reading the
+            <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>.
+        </para>
     </section>
 </section>