[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7686/8267] bitbake: bitbake-user-manual: Updated inherit and INHERIT sections

[Emmanuele Bassi <ebassi src gnome org>]

commit 4283ae56a90c21bc626fabfc51dd1b3a062b8838
Author: Scott Rifenbark <srifenbark gmail com>
Date:   Sat Sep 2 10:16:23 2017 -0700

    bitbake: bitbake-user-manual: Updated inherit and INHERIT sections
    
    Fixes [YOCTO #12031]
    
    Moved an inappropriate example from the bottom of the INHERIT
    Configuration Directive section up into the inherit directive
    section.
    
    Updated the example at the end of the INHERIT Configuration
    Directive section to apply to INHERIT.
    
    (Bitbake rev: f169ac5da18d55a40d0554668e1a0ace70f94768)
    
    Signed-off-by: Scott Rifenbark <srifenbark gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../bitbake-user-manual-metadata.xml               |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml 
b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index 310b9d2..b2595c9 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -923,6 +923,14 @@
                     inherited class within your recipe by doing so
                     after the "inherit" statement.
                 </note>
+                If you want to use the directive to inherit
+                multiple classes, you can separate the classes with spaces.
+                The following example shows how to inherit both the
+                <filename>autotools</filename> and <filename>pkgconfig</filename>
+                classes:
+                <literallayout class='monospaced'>
+     inherit autotools pkgconfig
+                </literallayout>
             </para>
 
             <para>
@@ -1076,8 +1084,9 @@
 
             <para>
                 When creating a configuration file (<filename>.conf</filename>),
-                you can use the <filename>INHERIT</filename> directive to
-                inherit a class.
+                you can use the
+                <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
+                configuration directive to inherit a class.
                 BitBake only supports this directive when used within
                 a configuration file.
             </para>
@@ -1099,8 +1108,7 @@
                 <note>
                     Because <filename>.conf</filename> files are parsed
                     first during BitBake's execution, using
-                    <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
-                    to inherit a class effectively
+                    <filename>INHERIT</filename> to inherit a class effectively
                     inherits the class globally (i.e. for all recipes).
                 </note>
                 If you want to use the directive to inherit
@@ -1111,7 +1119,7 @@
                 <filename>autotools</filename> and <filename>pkgconfig</filename>
                 classes:
                 <literallayout class='monospaced'>
-     inherit autotools pkgconfig
+     INHERIT += "autotools pkgconfig"
                 </literallayout>
             </para>
         </section>