From a1e8a7c12028e2861f112c5e5bfb0776ffe4d0e4 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Wed, 3 Apr 2013 15:21:36 -0700
Subject: [PATCH] ref-manual: Edits to the EXTRA_IMAGE_FEATURES variable.

Added information suggesting best use is from the
local.conf file.

(From yocto-docs rev: acfe2a58cab3ffbddaa1631e7df37d36f4f1422a)

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 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index f81ab62ded..0f36bb935e 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -948,15 +948,14 @@ Core layer for images cannot be removed
             <glossdef>
                 <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
+                    Typically, you configure this variable in your
+                    <filename>local.conf</filename> file, which is 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.
+                        variable from within a recipe to define the primary
+                        list of features you want to add to the image.
                     </note>
                 </para>
 
@@ -1007,7 +1006,7 @@ Core layer for images cannot be removed
                 </para>
 
                 <para>
-                    For some examples that show how to customize your image by
+                    For an example that shows 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.