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

Changes to show the best way to use this variable in relation
to the EXTRA_IMAGE_FEATURES variable.

(From yocto-docs rev: 3afa91f8fdecae18320364d9332639e725ecef5a)

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

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 0f36bb935e..0f86def5ca 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -1234,14 +1234,14 @@ Core layer for images cannot be removed
         <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES</glossterm>
             <glossdef>
                 <para>
-                    The list of features to include in an image.
+                    The primary list of 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>.
+                    Although you can use this variable from your
+                    <filename>local.conf</filename> file, which is found in the
+                    <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>,
+                    best practices dictate that you do not.
                     <note>
-                        You can also add extra features to the image by using
-                        the
+                        Add extra features to the image by using the
                         <filename><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></filename> variable.
                     </note>
                     For a list of image features that ships with the Yocto
@@ -1251,7 +1251,7 @@ Core layer for images cannot be removed
                 </para>
 
                 <para>
-                    For some examples that show how to customize your image by
+                    For 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.