From c0d6c1731d20c6b14b55fe512f722ddffcd14746 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Tue, 2 Apr 2013 14:57:26 -0700
Subject: [PATCH] ref-manual: Re-write of the EXTRA_IMAGE_FEATURES variable.

Modeled this after the re-write of the IMAGE_FEATURES
variable.

(From yocto-docs rev: 14f9e9926ad8abc0e2936ac59c90514406675bd3)

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

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 5e6ece440a..9c054eb936 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -946,14 +946,22 @@ Core layer for images cannot be removed
 
         <glossentry id='var-EXTRA_IMAGE_FEATURES'><glossterm>EXTRA_IMAGE_FEATURES</glossterm>
             <glossdef>
-                <para>Allows you to add extra packages to the generated images.
-                    You set this variable in the <filename>local.conf</filename>
-                    configuration file.
-                    Note that some image features are also added using the
-                    <filename><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></filename>
-                    variable generally configured in image recipes.
-                    You can use this variable to add more features in addition to those.
-                    Here are some examples of features you can add:</para>
+                <para>
+                    The list of additional features to include in an image.
+                    Typically, you configure this variable in an image recipe.
+                    You can also configure it in the <filename>local.conf</filename>
+                    file found in the 
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>.
+                    <note>
+                        Use the
+                        <link linkend='var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></link>
+                        variable to define the primary list of features you want to 
+                        add to the image.
+                    </note>
+                </para>
+
+                <para>
+                    Here are some examples of features you can add:
                     <literallayout class='monospaced'>
 "dbg-pkgs" - Adds -dbg packages for all installed packages
              including symbol information for debugging and
@@ -981,10 +989,21 @@ Core layer for images cannot be removed
                  password.  You should remove this feature
                  before you produce a production image.
                     </literallayout>
+                </para>
 
-                 <para>There are other valid features too, see the
-                 <link linkend='ref-features-image'>Images</link>
-                 section for more details.</para>
+                <para>
+                    For a complete list of image features that ships with the 
+                    Yocto Project, see the 
+                    "<link linkend="ref-features-image">Images</link>" 
+                    section.
+                </para>
+
+                <para>
+                    For some examples that show how to customize your image by 
+                    using this variable, see the 
+                    "<ulink url='&YOCTO_DOCS_DEV_URL;#usingpoky-extend-customimage-imagefeatures'>Customizing Images Using Custom <filename>IMAGE_FEATURES</filename> and <filename>EXTRA_IMAGE_FEATURES</filename></ulink>"
+                    section in the Yocto Project Development Manual.
+                </para>
             </glossdef>
         </glossentry>