diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 9521c7cd56..3024252b76 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1260,11 +1260,11 @@
                     <listitem><para>
                         <emphasis><filename>devtool add</filename>:</emphasis>
                         A command that assists in creating a recipe and
-                        an environment condusive to development.
+                        an environment conducive to development.
                         </para></listitem>
                     <listitem><para>
-                        <emphasis><filename>recipetool</filename>:</emphasis>
-                        A tool provided by the Yocto Project that automates
+                        <emphasis><filename>recipetool create</filename>:</emphasis>
+                        A command provided by the Yocto Project that automates
                         creation of a base recipe based on the source
                         files.
                         </para></listitem>
@@ -1294,18 +1294,17 @@
                 <para>
                     You can find a complete description of the
                     <filename>devtool add</filename> command in the
-                    "<ulink url='&YOCTO_DOCS_SDK_URL;#sdk-use-devtool-to-add-an-application'>Use <filename>devtool add</filename> to Add an Application</ulink>"
-                    section in the Yocto Project Software Development Kit (SDK)
-                    Developer's Guide.
+                    "<link linkend='use-devtool-to-integrate-new-code'>Use <filename>devtool add</filename> to Add an Application</link>"
+                    section.
                 </para>
             </section>
 
             <section id='new-recipe-creating-the-base-recipe-using-recipetool'>
-                <title>Creating the Base Recipe Using <filename>recipetool</filename></title>
+                <title>Creating the Base Recipe Using <filename>recipetool create</filename></title>
 
                 <para>
-                    <filename>recipetool</filename> automates creation of
-                    a base recipe given a set of source code files.
+                    <filename>recipetool create</filename> automates creation
+                    of a base recipe given a set of source code files.
                     As long as you can extract or point to the source files,
                     the tool will construct a recipe and automatically
                     configure all pre-build information into the recipe.
@@ -1832,7 +1831,7 @@
                 The quickest way to find this path is to have BitBake return it
                 by running the following:
                 <literallayout class='monospaced'>
-     $ bitbake -e recipename | grep ^WORKDIR=
+     $ bitbake -e <replaceable>basename</replaceable> | grep ^WORKDIR=
                 </literallayout>
                 As an example, assume a Source Directory top-level folder named
                 <filename>poky</filename>, a default Build Directory at