summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/ref-features.xml
diff options
context:
space:
mode:
authormmorton <mark.morton@windriver.com>2020-04-22 10:07:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 15:21:14 +0100
commitcd25abf77761fe608516cfb4c0d8bc40ccf45ec5 (patch)
tree9b81055d783b16619ddef565d13088a6a2b4e78d /documentation/ref-manual/ref-features.xml
parentfe25ef9871994b7a3c6bad6eeec1174900b3422c (diff)
downloadpoky-cd25abf77761fe608516cfb4c0d8bc40ccf45ec5.tar.gz
Added usrmerge to distro-features for Bug 13494
(From yocto-docs rev: 049832ea4c13b01c31911ad0a6f3e170781db6cd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/ref-features.xml')
-rw-r--r--documentation/ref-manual/ref-features.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/documentation/ref-manual/ref-features.xml b/documentation/ref-manual/ref-features.xml
index 44ba67cf50..294b297c20 100644
--- a/documentation/ref-manual/ref-features.xml
+++ b/documentation/ref-manual/ref-features.xml
@@ -210,6 +210,12 @@
210 <listitem><para><emphasis>usbhost:</emphasis> Include USB Host 210 <listitem><para><emphasis>usbhost:</emphasis> Include USB Host
211 support (allows to connect external keyboard, mouse, 211 support (allows to connect external keyboard, mouse,
212 storage, network etc).</para></listitem> 212 storage, network etc).</para></listitem>
213 <listitem><para><emphasis>usrmerge:</emphasis> Merges the
214 <filename>/bin</filename>, <filename>/sbin</filename>,
215 <filename>/lib</filename>, and <filename>/lib64</filename>
216 directories into their respective counterparts in the
217 <filename>/usr</filename> directory to provide better package
218 and application compatibility.</para></listitem>
213 <listitem><para><emphasis>wayland:</emphasis> Include the 219 <listitem><para><emphasis>wayland:</emphasis> Include the
214 Wayland display server protocol and the library that 220 Wayland display server protocol and the library that
215 supports it.</para></listitem> 221 supports it.</para></listitem>