Squashed 'import-layers/yocto-poky/' changes from dc8508f6099..67491b0c104
Yocto 2.2.2 (Morty)
Change-Id: Id9a452e28940d9f166957de243d9cb1d8818704e
git-subtree-dir: import-layers/yocto-poky
git-subtree-split: 67491b0c104101bb9f366d697edd23c895be4302
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-features.xml b/import-layers/yocto-poky/documentation/ref-manual/ref-features.xml
index cd1bcb0..282a517 100644
--- a/import-layers/yocto-poky/documentation/ref-manual/ref-features.xml
+++ b/import-layers/yocto-poky/documentation/ref-manual/ref-features.xml
@@ -142,6 +142,18 @@
<listitem><para><emphasis>alsa:</emphasis> Include ALSA support
(OSS compatibility kernel modules installed if available).
</para></listitem>
+ <listitem><para><emphasis>api-documentation:</emphasis>
+ Enables generation of API documentation during recipe
+ builds.
+ The resulting documentation is added to SDK tarballs
+ when the
+ <filename>bitbake -c populate_sdk</filename> command
+ is used.
+ See the
+ "<ulink url='&YOCTO_DOCS_SDK_URL;#adding-api-documentation-to-the-standard-sdk'>Adding API Documentation to the Standard SDK</ulink>"
+ section in the Yocto Project Software Development Kit (SDK)
+ Developer's Guide for more information.
+ </para></listitem>
<listitem><para><emphasis>bluetooth:</emphasis> Include
bluetooth support (integrated BT only).</para></listitem>
<listitem><para><emphasis>bluez5:</emphasis> Include