1 files changed, 62 insertions, 56 deletions

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 6ad61d633a..d65d73d59d 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -630,62 +630,30 @@
                 the <link linkend='build-directory'>Build Directory</link>.
             </para>
 
-            <section id='choosing-the-ssh-servers'>
-                <title>Choosing the SSH Server</title>
-
-                <para>
-                    The Yocto Project ships with two SSH servers you can use
-                    with 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.
-                </para>
-
-                <para>
-                    You can customize your image and change these defaults.
-                    Edit <filename>IMAGE_FEATURES</filename> variable
-                    so that it configures the image you are working with to
-                    include <filename>ssh-server-dropbear</filename> or
-                    <filename>ssh-server-openssh</filename>.
-                </para>
-            </section>
-
-            <section id='creating-a-read-only-root-filesystem'>
-                <title>Creating a Read-Only Root Filesystem</title>
-
-                <para>
-                    Another example of customizing your image could be setting
-                    up a read-only filesystem.
-                    Suppose, for security reasons, you need to disable the
-                    your target device's root filesystem's write permisions
-                    (i.e. you need a read-only root filesystem).
-                    Or, perhaps you are running the device's operating system
-                    from a read-only storage device.
-                    For either case, you can customize your image for
-                    that behavior.
-                </para>
-
-                <para>
-                    To create a read-only root filesystem, simply add the
-                    "read-only-rootfs" feature to your image.
-                    Using either of the following statements in your
-                    image recipe or from within the
-                    <filename>local.conf</filename> file found in the Build
-                    Directory causes the build system to create a
-                    read-only root filesystem:
-                    <literallayout class='monospaced'>
-     IMAGE_FEATURES = "read-only-rootfs"
-     EXTRA_IMAGE_FEATURES = "read-only-rootfs"
-                    </literallayout>
-                </para>
-            </section>
+            <para>
+                To illustrate how you can use these variables to modify your
+                image, consider an example that selects the SSH server.
+                The Yocto Project ships with two SSH servers you can use
+                with 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.
+            </para>
+
+            <para>
+                You can customize your image and change these defaults.
+                Edit <filename>IMAGE_FEATURES</filename> variable
+                so that it configures the image you are working with to
+                include <filename>ssh-server-dropbear</filename> or
+                <filename>ssh-server-openssh</filename>.
+            </para>
         </section>
 
         <section id='usingpoky-extend-customimage-localconf'>
@@ -3447,6 +3415,44 @@
         </para>
     </section>
 
+    <section id='creating-a-read-only-root-filesystem'>
+        <title>Creating a Read-Only Root Filesystem</title>
+
+        <para>
+            Suppose, for security reasons, you need to disable the
+            your target device's root filesystem's write permisions
+            (i.e. you need a read-only root filesystem).
+            Or, perhaps you are running the device's operating system
+            from a read-only storage device.
+            For either case, you can customize your image for
+            that behavior.
+        </para>
+
+        <para>
+            To create a read-only root filesystem, simply add the
+            "read-only-rootfs" feature to your image.
+            Using either of the following statements in your
+            image recipe or from within the
+            <filename>local.conf</filename> file found in the Build
+            Directory causes the build system to create a
+            read-only root filesystem:
+            <literallayout class='monospaced'>
+     IMAGE_FEATURES = "read-only-rootfs"
+     EXTRA_IMAGE_FEATURES = "read-only-rootfs"
+            </literallayout>
+        </para>
+
+        <para>
+            For more information on how to use these variables, see the
+            "<link linkend='usingpoky-extend-customimage-imagefeatures'>Customizing Images Using Custom <filename>IMAGE_FEATURES</filename> and <filename>EXTRA_IMAGE_FEATURES</filename></link>"
+            section.
+            For information on the variables, see
+            <ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></ulink>
+            and <ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_IMAGE_FEATURES'><filename>EXTRA_IMAGE_FEATURES</filename></ulink>.
+        </para>
+    </section>
+
+
     <section id="platdev-gdb-remotedebug">
         <title>Debugging With the GNU Project Debugger (GDB) Remotely</title>