summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml3
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml16
2 files changed, 15 insertions, 4 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 1d1e5b35f0..b32fa33926 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -1072,7 +1072,8 @@
1072 <note> 1072 <note>
1073 Because <filename>.conf</filename> files are parsed 1073 Because <filename>.conf</filename> files are parsed
1074 first during BitBake's execution, using 1074 first during BitBake's execution, using
1075 <filename>INHERIT</filename> to inherit a class effectively 1075 <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
1076 to inherit a class effectively
1076 inherits the class globally (i.e. for all recipes). 1077 inherits the class globally (i.e. for all recipes).
1077 </note> 1078 </note>
1078 If you want to use the directive to inherit 1079 If you want to use the directive to inherit
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
index 0e89bf2396..07bda982f3 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
@@ -1596,9 +1596,19 @@
1596 <glossentry id='var-INHERIT'><glossterm>INHERIT</glossterm> 1596 <glossentry id='var-INHERIT'><glossterm>INHERIT</glossterm>
1597 <glossdef> 1597 <glossdef>
1598 <para> 1598 <para>
1599 Causes the named class to be inherited at 1599 Causes the named class or classes to be inherited globally.
1600 this point during parsing. 1600 Anonymous functions in the class or classes
1601 The variable is only valid in configuration files. 1601 are not executed for the
1602 base configuration and in each individual recipe.
1603 The OpenEmbedded build system ignores changes to
1604 <filename>INHERIT</filename> in individual recipes.
1605 </para>
1606
1607 <para>
1608 For more information on <filename>INHERIT</filename>, see
1609 the
1610 "<link linkend="inherit-configuration-directive"><filename>INHERIT</filename> Configuration Directive</link>"
1611 section.
1602 </para> 1612 </para>
1603 </glossdef> 1613 </glossdef>
1604 </glossentry> 1614 </glossentry>