summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/ref-variables.xml
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:54:07 +0000
commitd0d86d62a52c5d819e8639b549e3651930d428f7 (patch)
treefda45da543325b4bf3138932a3e9cf8f292bf721 /documentation/ref-manual/ref-variables.xml
parentc86bd272ea2f9e7fdbe59cffd14de826f5ad12a5 (diff)
downloadpoky-d0d86d62a52c5d819e8639b549e3651930d428f7.tar.gz
ref-manual: Edits to the COMBINED_FEATURES variable.
(From yocto-docs rev: c1e2a7f8985f058d520615ef389007424d7d4b7f) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/ref-variables.xml')
-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