diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 9096ea61a4..b28b7e21ec 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -606,38 +606,48 @@
                 <filename>EXTRA_IMAGE_FEATURES</filename></title>
 
             <para>
-                Ultimately users might want to add extra image features to the set by using the
+                Ultimately, you might want to add extra image features to the 
+                set by using the
                 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'>IMAGE_FEATURES</ulink></filename>
                 variable.
                 To create these features, the best reference is
-                <filename>meta/classes/core-image.bbclass</filename>, which shows how this is
-                achieved.
+                <filename>meta/classes/core-image.bbclass</filename>, which 
+                shows how you can add features.
                 In summary, the file looks at the contents of the
-                <filename>IMAGE_FEATURES</filename>
-                variable and then maps that into a set of tasks or packages.
-                Based on this information, the
+                <filename>IMAGE_FEATURES</filename> variable and then maps those 
+                contents into a set of tasks or packages.
+                Based on this information, the build system automatically
+                generates the 
                 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_INSTALL'> IMAGE_INSTALL</ulink></filename>
-                variable is generated automatically.
-                Users can add extra features by extending the class or creating a custom class for use
-                with specialized image <filename>.bb</filename> files.
+                variable.
+                You can add extra features by extending the class or creating a 
+                custom class for use with specialized image 
+                <filename>.bb</filename> files.
                 You can also add more features by configuring the
                 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</ulink></filename>
-                variable in the <filename>local.conf</filename> file found in the Source Directory
-                located in the Build Directory.
+                variable in the <filename>local.conf</filename> file found in 
+                the <filename>local.conf</filename> file, which is located in  
+                the <link linkend='build-directory'>Build Directory</link>.
             </para>
 
             <para>
-                The Yocto Project ships with two SSH servers you can use in your images:
-                Dropbear and OpenSSH.
-                Dropbear is a minimal SSH server appropriate for resource-constrained environments,
-                while OpenSSH is a well-known standard SSH server implementation.
-                By default, the <filename>core-image-sato</filename> image is configured to use Dropbear.
-                The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename>
-                images both include OpenSSH.
-                The <filename>core-image-minimal</filename> image does not contain an SSH server.
-                To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
+                The Yocto Project ships with two SSH servers you can use in your 
+                images: Dropbear and OpenSSH.
+                Dropbear is a minimal SSH server appropriate for 
+                resource-constrained environments, while OpenSSH is a well-known 
+                standard SSH server implementation.
+                By default, the <filename>core-image-sato</filename> image is 
+                configured to use Dropbear.
+                The <filename>core-image-basic</filename> and 
+                <filename>core-image-lsb</filename> images both 
+                include OpenSSH.
+                The <filename>core-image-minimal</filename> image does not 
+                contain an SSH server.
+                To change these defaults, edit the 
+                <filename>IMAGE_FEATURES</filename> variable
                 so that it sets the image you are working with to include
-                <filename>ssh-server-dropbear</filename> or <filename>ssh-server-openssh</filename>.
+                <filename>ssh-server-dropbear</filename> or 
+                <filename>ssh-server-openssh</filename>.
             </para>
         </section>