summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2014-08-08 13:06:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-12 13:50:31 +0100
commit8732dab099b949d8879a2c4a3a936ed0dd590a86 (patch)
treec0e22a61f89a0693c9aebe0a9775100a0c2d097c
parent2ef2b72b2cd92a3a101e4ae50ee89642335ea7a9 (diff)
downloadopenembedded-core-contrib-8732dab099b949d8879a2c4a3a936ed0dd590a86.tar.gz
openembedded-core-contrib-8732dab099b949d8879a2c4a3a936ed0dd590a86.tar.bz2
openembedded-core-contrib-8732dab099b949d8879a2c4a3a936ed0dd590a86.zip
ref-manual: Minor edits for clarity.
(From yocto-docs rev: 79025b3cb5e3af25d960f0fc9f2266a8dcb3fd12) 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-features.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml
index 4aafaea674..c7fcb870f8 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/documentation/ref-manual/ref-features.xml
@@ -7,8 +7,8 @@
<para>
This chapter provides a reference of shipped machine and distro features
- you can include as part of the image, a reference on image types you can
- build, and a reference on feature backfilling.
+ you can include as part of your image, a reference on image features you can
+ select, and a reference on feature backfilling.
</para>
<para>
@@ -16,7 +16,10 @@
should be included in the generated images.
Distributions can select which features they want to support through the
<filename><link linkend='var-DISTRO_FEATURES'>DISTRO_FEATURES</link></filename>
- variable, which is set in the <filename>poky.conf</filename> distribution configuration file.
+ variable, which is set or appended to in a distribution's configuration file such as
+ <filename>poky.conf</filename>,
+ <filename>poky-tiny.conf</filename>,
+ <filename>poky-lsb.conf</filename> and so forth.
Machine features are set in the
<filename><link linkend='var-MACHINE_FEATURES'>MACHINE_FEATURES</link></filename>
variable, which is set in the machine configuration file and