1 files changed, 22 insertions, 19 deletions

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 59c392f9db..63a447d59b 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -161,10 +161,10 @@
                     <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>.
                     The recipes and configurations for these five BSPs are located and dispersed
                     within the <link linkend='source-directory'>Source Directory</link>.
-                    On the other hand, BSP layers for Chief River, Crown Bay,
+                    On the other hand, BSP layers for Crown Bay,
                     Crystal Forest, Emenlow, Fish River Island 2, Haswell,
-                    Jasper Forest, N450, NUC DC3217IYE,
-                    Romley, sys940x, Sugar Bay, and tlk exist in their own separate layers
+                    Jasper Forest, NUC DC3217IYE,
+                    Romley, Sugar Bay, and tlk exist in their own separate layers
                     within the larger <filename>meta-intel</filename> layer.</note>
                     <para>When you set up a layer for a new BSP, you should follow a standard layout.
                     This layout is described in the
@@ -672,7 +672,7 @@
                 <title>Installing the Eclipse IDE</title>
 
                 <para>
-                    It is recommended that you have the Kepler 4.3 version of
+                    It is recommended that you have the Kepler 4.3.2 version of
                     the Eclipse IDE installed on your development system.
                     However, if you currently have the Juno 4.2 version
                     installed and you do not want to upgrade the IDE, you can
@@ -680,10 +680,10 @@
                 </para>
 
                 <para>
-                    If you do not have the Kepler 4.3 Eclipse IDE installed, you
-                    can find the tarball at
+                    If you do not have the Kepler 4.3.2 Eclipse IDE installed,
+                    you can find the tarball at
                     <ulink url='&ECLIPSE_MAIN_URL;'></ulink>.
-                    From that site, choose the Eclipse Standard 4.3 version
+                    From that site, choose the Eclipse Standard 4.3.2 version
                     particular to your development host.
                     This version contains the Eclipse Platform, the Java
                     Development Tools (JDT), and the Plug-in Development
@@ -698,7 +698,7 @@
                     using the default name <filename>eclipse</filename>:
                     <literallayout class='monospaced'>
      $ cd ~
-     $ tar -xzvf ~/Downloads/eclipse-standard-kepler-R-linux-gtk-x86_64.tar.gz
+     $ tar -xzvf ~/Downloads/eclipse-standard-kepler-SR2-linux-gtk-x86_64.tar.gz
                     </literallayout>
                 </para>
             </section>
@@ -735,7 +735,7 @@
                         <listitem><para>Expand the box next to "Mobile and
                             Device Development" and select the following boxes:
                             <itemizedlist>
-                                <listitem><para><filename>C/C++ Remote Launch</filename></para></listitem>
+                                <listitem><para><filename>C/C++ Remote Launch (Requires RSE Remote System Explorer)</filename></para></listitem>
                                 <listitem><para><filename>Remote System Explorer End-user Runtime</filename></para></listitem>
                                 <listitem><para><filename>Remote System Explorer User Actions</filename></para></listitem>
                                 <listitem><para><filename>Target Management Terminal</filename></para></listitem>
@@ -744,7 +744,7 @@
                             </itemizedlist></para></listitem>
                         <listitem><para>Expand the box next to "Programming
                             Languages" and select the
-                            <filename>Autotools Support for CDT</filename>
+                            <filename>C/C++ Autotools Support</filename>
                             and <filename>C/C++ Development Tools</filename>
                             boxes.</para></listitem>
                         <listitem><para>Complete the installation and restart
@@ -871,7 +871,8 @@
                             <listitem><para>When the script finishes execution,
                                 it prompts you with instructions on how to run
                                 the <filename>build.sh</filename> script, which
-                                is also in the <filename>scripts</filename> of
+                                is also in the <filename>scripts</filename>
+                                directory of
                                 the Git repository created earlier.
                                 </para></listitem>
                             <listitem><para>Run the <filename>build.sh</filename> script
@@ -896,7 +897,7 @@
                             <listitem><para>Provide anything you want in the
                                 "Name" field.</para></listitem>
                             <listitem><para>Click "Archive" and browse to the
-                                ZIP file you built in step seven.
+                                ZIP file you built in step eight.
                                 This ZIP file should not be "unzipped", and must
                                 be the <filename>*archive.zip</filename> file
                                 created by running the
@@ -1016,7 +1017,7 @@
                                 If you used the ADT Installer script and
                                 accepted the default installation directory,
                                 then the location is
-                                <filename>/opt/poky/&lt;release&gt;</filename>.
+                                <filename>/opt/poky/&DISTRO;</filename>.
                                 Additionally, when you use the ADT Installer
                                 script, the same location is used for the QEMU
                                 user-space tools and the NFS boot process.
@@ -1031,7 +1032,9 @@
                                 <para>For information on how to install the
                                 toolchain and on how to extract and install the
                                 sysroot filesystem, see the
-                                "<ulink url='&YOCTO_DOCS_ADT_URL;#installing-the-adt'>Installing the ADT and Toolchains</ulink>" section.
+                                "<ulink url='&YOCTO_DOCS_ADT_URL;#installing-the-adt'>Installing the ADT and Toolchains</ulink>"
+                                section in the Yocto Project Application
+                                Developer's Guide.
                                 </para></listitem>
                             <listitem><para><emphasis>Select the Target Architecture:</emphasis>
                                 The target architecture is the type of hardware
@@ -1059,7 +1062,7 @@
                         emulator, or you can choose to run your image on actual
                         hardware.
                         <itemizedlist>
-                            <listitem><para><emphasis><filename>QEMU:</filename></emphasis>
+                            <listitem><para><emphasis>QEMU:</emphasis>
                                 Select this option if you will be using the
                                 QEMU emulator.
                                 If you are using the emulator, you also need to
@@ -1099,7 +1102,7 @@
                                 configuration in the
                                 <filename>Sysroot Location:</filename> field.
                                 </para></listitem>
-                            <listitem><para><emphasis><filename>External HW:</filename></emphasis>
+                            <listitem><para><emphasis>External HW:</emphasis>
                                 Select this option if you will be using actual
                                 hardware.</para></listitem>
                         </itemizedlist>
@@ -1186,7 +1189,7 @@
                         individual project.</para>
                         <para>By default, the Cross Compiler Options and Target
                         Options for a project are inherited from settings you
-                        provide using the Preferences Dialog as described
+                        provided using the Preferences Dialog as described
                         earlier in the
                         "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring the Eclipse Yocto Plug-in</link>" section.
                         The Yocto Project Settings Dialog allows you to override
@@ -1264,7 +1267,7 @@
 
             <para>
                 Once the QEMU emulator is running the image, you can deploy
-                your application using the Eclipse IDE and use then use
+                your application using the Eclipse IDE and then use
                 the emulator to perform debugging.
                 Follow these steps to deploy the application.
                 <orderedlist>
@@ -1349,7 +1352,7 @@
                         <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/oprofileui/'></ulink>.
                         You can also find more information on setting up and
                         using this tool in the
-                        "<ulink url='&YOCTO_DOCS_PROF_URL;#profile-manual-oprofile'>OProfile</ulink>"
+                        "<ulink url='&YOCTO_DOCS_PROF_URL;#profile-manual-oprofile'>oprofile</ulink>"
                         section of the Yocto Project Profiling and Tracing
                         Manual.
                         <note>The <filename>oprofile-server</filename> is