From 4c2b2fc32462866b8cb133b4cb44ce9f7f3159ed Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 16 Nov 2012 08:43:39 -0600
Subject: documentation: poky-ref-manual - new COMBINED_FEATURES variable.

Fixes [YOCTO #3292]

Partial fix for this bug.

(From yocto-docs rev: 300d23b29d8abf236cbfa6f2630322c58ca67854)

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

(limited to 'documentation/poky-ref-manual/ref-variables.xml')

diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index a532028..4900879 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -469,6 +469,15 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-COMBINED_FEATURES'><glossterm>COMBINED_FEATURES</glossterm>
+            <glossdef>
+                <para>A set of features common between 
+                    <link linkend='var-MACHINE_FEATURES'><filename>MACHINE_FEATURES</filename></link>
+                    and <link linkend='var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></link>.
+                    See the glossary descriptions for these variables for more information.</para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-COMPATIBLE_MACHINE'><glossterm>COMPATIBLE_MACHINE</glossterm>
             <glossdef>
                 <para>A regular expression which evaluates to match the machines the recipe 
-- 
cgit v1.1