diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml
index dedcf67e33..c884a8963e 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/documentation/ref-manual/ref-features.xml
@@ -44,7 +44,7 @@
- Distro
+ Distro Features
The items below are features you can use with
@@ -75,7 +75,7 @@
support.ipv6: Include IPv6 support.
- irda: Include Irda support.
+ irda: Include IrDA support.
keyboard: Include keyboard
support (e.g. keymaps will be loaded during boot).
@@ -126,7 +126,7 @@
- Machine
+ Machine Features
The items below are features you can use with
@@ -152,7 +152,7 @@
ext2: Hardware HDD or Microdrive
- irda: Hardware has Irda support
+ irda: Hardware has IrDA support
keyboard: Hardware has a keyboard
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 43898e158c..cb8d9a5b39 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -917,10 +917,27 @@
COMBINED_FEATURES
- A set of features common between
+
+ Provides a list of hardware features that are enabled in
+ both
MACHINE_FEATURES
- and DISTRO_FEATURES.
- See the glossary descriptions for these variables for more information.
+ and
+ DISTRO_FEATURES.
+ This select list of features is a list features that make
+ sense to be controlled both at the machine and distribution
+ configuration level.
+ For example, the "bluetooth" feature requires hardware
+ support but should also be optional at the distribution
+ level, in case the hardware supports Bluetooth but you
+ do not ever intend to use it.
+
+
+
+ For more information, see the
+ MACHINE_FEATURES
+ and DISTRO_FEATURES
+ variables.
+
@@ -1306,10 +1323,25 @@
DISTRO_FEATURES
- The features enabled for the distribution.
- For a list of supported features that ship with the
- Yocto Project, see the
- "Distro"
+
+ The software support you want in your distribution for
+ various features.
+ In most cases, the presence or absence of a feature in
+ DISTRO_FEATURES is translated to the
+ appropriate option supplied to the configure script
+ during do_configure for recipes that
+ optionally support the feature.
+ For example, specifying x11 in
+ DISTRO_FEATURES, causes
+ every piece of software built for the target that can
+ optionally support X11 to have its X11 support enabled.
+
+
+
+ Two more examples are Bluetooth and NFS support.
+ For a more complete features that ship with the Yocto
+ Project that you can provide using this variable, see the
+ "Distro Features"
section.
@@ -3344,20 +3376,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
MACHINE_FEATURES
- Specifies the list of hardware features the
- MACHINE supports.
- For example, including the "bluetooth" feature causes the
- bluez bluetooth daemon to be built and
- added to the image.
- It also causes the connman recipe
- to look at MACHINE_FEATURES and when it
- finds "bluetooth" there it enables the bluetooth
- support in ConnMan.
+
+ Specifies the list of hardware features the
+ MACHINE is capable
+ of supporting.
+ For related information on enabling features, see the
+ DISTRO_FEATURES,
+ COMBINED_FEATURES,
+ and
+ IMAGE_FEATURES
+ variables.
- For a list of features supported by the Yocto Project as shipped,
- see the "Machine" section.
+ For a list of hardware features supported by the Yocto
+ Project as shipped, see the
+ "Machine Features"
+ section.