diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d9be6a0b46..27e52839c0 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -6427,15 +6427,9 @@
                         <link linkend='local-yp-release'>Yocto Project Release</link>
                         item for information on how to set up the Source
                         Directory.</para></listitem>
-                    <listitem><para>You have checked out the
-                        <filename>dora-toaster</filename> branch:
-                        <literallayout class='monospaced'>
-     $ cd poky
-     $ git checkout -b dora-toaster origin/dora-toaster
-                        </literallayout></para></listitem>
                     <listitem><para>Be sure your build machine has
                         <ulink url='http://en.wikipedia.org/wiki/Django_%28web_framework%29'>Django</ulink>
-                        version 1.4.5 installed.</para></listitem>
+                        version 1.5 installed.</para></listitem>
                     <listitem><para>Make sure that port 8000 and 8200 are
                         free (i.e. they have no servers on them).
                         </para></listitem>
@@ -6453,7 +6447,9 @@
                         <ulink url='&YOCTO_DOCS_REF_URL;#structure-memres-core-script'><filename>oe-init-build-env-memres</filename></ulink>).
                         </para></listitem>
                     <listitem><para><emphasis>Prepare your local configuration file:</emphasis>
-                        Toaster needs the Toaster class enabled
+                        Toaster needs the
+                        <ulink url='&YOCTO_DOCS_REF_URL;#toaster'><filename>toaster</filename></ulink>
+                        class enabled
                         in Bitbake in order to record target image package
                         information.
                         You can enable it by adding the following line to your
@@ -6461,16 +6457,7 @@
                         <literallayout class='monospaced'>
      INHERIT += "toaster"
                         </literallayout>
-                        Toaster also needs
-                        <ulink url='&YOCTO_DOCS_REF_URL;#maintaining-build-output-quality'>build history</ulink>
-                        enabled in Bitbake in
-                        order to record target image package information.
-                        You can enable this by adding the following two lines
-                        to your <filename>conf/local.conf</filename> file:
-                        <literallayout class='monospaced'>
-     INHERIT += "buildhistory"
-     BUILDHISTORY_COMMIT = "1"
-                        </literallayout></para></listitem>
+                        </para></listitem>
                     <listitem><para><emphasis>Start Toaster:</emphasis>
                         Start the Toaster service using this
                         command from within your
@@ -6531,6 +6518,22 @@
                 Either method opens the home page for the Toaster interface,
                 which is temporary for this release.
             </para>
+
+            <note><title>Notes</title>
+                <para>
+                    For information on how to delete information from the Toaster
+                    database, see the
+                    <ulink url='https://wiki.yoctoproject.org/wiki/Toaster#Deleting_a_Build_from_the_Toaster_Database'>Deleting a Build from the Toaster Database</ulink>
+                    wiki page.
+                </para>
+
+                <para>
+                    For information on how to set up an instance of Toaster on
+                    a remote host, see the
+                    <ulink url='https://wiki.yoctoproject.org/wiki/Toaster#Setting_up_a_Toaster_Instance_on_a_Remote_Host'>Setting Up a Toaster Instance on a Remote Host</ulink>
+                    wiki page.
+                </para>
+            </note>
         </section>
 
         <section id='examining-toaster-data'>