summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-11-21 17:17:12 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 12:53:18 +0000
commit3cd9b7e1acf15da3a0cd25206d38539f4a86630e (patch)
treed88e52bbea67b2a3a34c9e60c00052934f1a41e6
parent9a8d0ea021714e61c054d9aeaa6b6a6a0c617906 (diff)
downloadpoky-3cd9b7e1acf15da3a0cd25206d38539f4a86630e.tar.gz
ref-manual: Edits to the COMBINED_FEATURES variable.
(From yocto-docs rev: 13405652b9a170960f15bd30a0c335df25e8b294) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/ref-manual/ref-variables.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 773eb88fdf..87a97c8186 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -923,7 +923,7 @@
923 <link linkend='var-MACHINE_FEATURES'><filename>MACHINE_FEATURES</filename></link> 923 <link linkend='var-MACHINE_FEATURES'><filename>MACHINE_FEATURES</filename></link>
924 and 924 and
925 <link linkend='var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></link>. 925 <link linkend='var-DISTRO_FEATURES'><filename>DISTRO_FEATURES</filename></link>.
926 This select list of features is a list features that make 926 This select list of features contains features that make
927 sense to be controlled both at the machine and distribution 927 sense to be controlled both at the machine and distribution
928 configuration level. 928 configuration level.
929 For example, the "bluetooth" feature requires hardware 929 For example, the "bluetooth" feature requires hardware