From e90f4a13603a30f26cf58ed56a1f645fdef1bfe6 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Tue, 30 Sep 2014 14:24:22 -0700
Subject: ref-manual: Minor edits to "Image Features" section.

Reversed order of the list presentation and re-worded the static
library sentence.

(From yocto-docs rev: 5c32730550629527f6ceb2140df31a097f7a6081)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/ref-manual/ref-features.xml | 106 +++++++++++++++---------------
 1 file changed, 52 insertions(+), 54 deletions(-)

(limited to 'documentation')

diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml
index 174f44f3e7..c216ded866 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/documentation/ref-manual/ref-features.xml
@@ -219,11 +219,62 @@
             profile applications.
         </para>
 
+        <para>
+            The following image features are available for all images:
+            <itemizedlist>
+                <listitem><para><emphasis>dbg-pkgs:</emphasis>
+                    Installs debug symbol packages for all packages installed
+                    in a given image.
+                    </para></listitem>
+                <listitem><para><emphasis>debug-tweaks:</emphasis>
+                    Makes an image suitable for development (e.g.
+                    allows root logins without passwords).
+                    </para></listitem>
+                <listitem><para><emphasis>dev-pkgs:</emphasis>
+                    Installs development packages (headers and extra library
+                    links) for all packages installed in a given image.
+                    </para></listitem>
+                <listitem><para><emphasis>doc-pkgs:</emphasis> Installs
+                    documentation packages for all packages installed in a
+                    given image.
+                    </para></listitem>
+                <listitem><para><emphasis>package-management:</emphasis>
+                    Installs package management tools and preserves the package
+                    manager database.
+                    </para></listitem>
+                <listitem><para><emphasis>ptest-pkgs:</emphasis>
+                    Installs ptest packages for all ptest-enabled recipes.
+                    </para></listitem>
+                <listitem><para><emphasis>read-only-rootfs:</emphasis>
+                    Creates an image whose root filesystem is read-only.
+                    See the
+                    "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-read-only-root-filesystem'>Creating a Read-Only Root Filesystem</ulink>"
+                    section in the Yocto Project Development Manual for more
+                    information.
+                    </para></listitem>
+                <listitem><para><emphasis>splash:</emphasis>
+                    Enables showing a splash screen during boot.
+                    By default, this screen is provided by
+                    <filename>psplash</filename>, which does allow
+                    customization.
+                    If you prefer to use an alternative splash screen package,
+                    you can do so by setting the <filename>SPLASH</filename>
+                    variable to a different package name (or names) within the
+                    image recipe or at the distro configuration level.
+                    </para></listitem>
+                <listitem><para><emphasis>staticdev-pkgs:</emphasis>
+                    Installs static development packages, which are
+                    static libraries (e.g. <filename>*.a</filename> files), for
+                    all packages installed in a given image.
+                    </para></listitem>
+            </itemizedlist>
+        </para>
+
         <para>
             Some image features are available only when you inherit the
             <link linkend='ref-classes-core-image'><filename>core-image</filename></link>
             class.
-            The current list of these valid variables is as follows:
+            The current list of these valid features is as follows:
             <itemizedlist>
                 <listitem><para><emphasis>eclipse-debug:</emphasis> Provides
                     Eclipse remote debugging support.
@@ -284,59 +335,6 @@
             </itemizedlist>
         </para>
 
-        <para>
-            Other image features are available for all images regardless of
-            whether or not you inherit the <filename>core-image</filename>
-            class.
-            The list of these valid variables is as follows:
-            <itemizedlist>
-                <listitem><para><emphasis>dbg-pkgs:</emphasis>
-                    Installs debug symbol packages for all packages installed
-                    in a given image.
-                    </para></listitem>
-                <listitem><para><emphasis>debug-tweaks:</emphasis>
-                    Makes an image suitable for development (e.g.
-                    allows root logins without passwords).
-                    </para></listitem>
-                <listitem><para><emphasis>dev-pkgs:</emphasis>
-                    Installs development packages (headers and extra library
-                    links) for all packages installed in a given image.
-                    </para></listitem>
-                <listitem><para><emphasis>doc-pkgs:</emphasis> Installs
-                    documentation packages for all packages installed in a
-                    given image.
-                    </para></listitem>
-                <listitem><para><emphasis>package-management:</emphasis>
-                    Installs package management tools and preserves the package
-                    manager database.
-                    </para></listitem>
-                <listitem><para><emphasis>ptest-pkgs:</emphasis>
-                    Installs ptest packages for all ptest-enabled recipes.
-                    </para></listitem>
-                <listitem><para><emphasis>read-only-rootfs:</emphasis>
-                    Creates an image whose root filesystem is read-only.
-                    See the
-                    "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-read-only-root-filesystem'>Creating a Read-Only Root Filesystem</ulink>"
-                    section in the Yocto Project Development Manual for more
-                    information.
-                    </para></listitem>
-                <listitem><para><emphasis>splash:</emphasis>
-                    Enables showing a splash screen during boot.
-                    By default, this screen is provided by
-                    <filename>psplash</filename>, which does allow
-                    customization.
-                    If you prefer to use an alternative splash screen package,
-                    you can do so by setting the <filename>SPLASH</filename>
-                    variable to a different package name (or names) within the
-                    image recipe or at the distro configuration level.
-                    </para></listitem>
-                <listitem><para><emphasis>staticdev-pkgs:</emphasis>
-                    Installs static development packages (i.e. static
-                    libraries containing <filename>*.a</filename> files) for
-                    all packages installed in a given image.
-                    </para></listitem>
-            </itemizedlist>
-        </para>
     </section>
 
     <section id='ref-features-backfill'>
-- 
cgit v1.2.3-54-g00ecf