From acf41de1faa9e5d7a4960953a07308e40e9790d7 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 30 Mar 2015 13:37:11 -0700
Subject: ref-manual: Downplayed the BBLAYERS_NON_REMOVABLE variable.

Applied some suggestions from Paul Eggleton to downplay the role
of this variable.  It is basically ignored now in all parts of the
manual set except for the descriptions of the variable itself
and the BBLAYERS variable.  I added some text reinforcing the fact
that BBLAYERS_NON_REMOVABLE is ignored by the build system and only
matters if you are using Hob.

(From yocto-docs rev: 98112751aaec6e25de48d9e3ee56592be3f53a07)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/ref-manual/ref-structure.xml |  4 +---
 documentation/ref-manual/ref-variables.xml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'documentation')

diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 8976097..d6e506d 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -522,9 +522,7 @@
             which are directory trees, traversed (or walked) by BitBake.
             The <filename>bblayers.conf</filename> file uses the
             <link linkend='var-BBLAYERS'><filename>BBLAYERS</filename></link>
-            variable to list the layers BitBake tries to find, and uses the
-            <link linkend='var-BBLAYERS_NON_REMOVABLE'><filename>BBLAYERS_NON_REMOVABLE</filename></link>
-            variable to list layers that must not be removed.
+            variable to list the layers BitBake tries to find.
         </para>
 
         <para>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index a79d8e5..2d2337c 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -993,6 +993,14 @@
        /home/scottrif/poky/meta-yocto \
        "
                     </literallayout>
+                    <note>
+                        The
+                        <link linkend='var-BBLAYERS_NON_REMOVABLE'><filename>BBLAYERS_NON_REMOVABLE</filename></link>
+                        variable exists only for
+                        <ulink url='https://www.yoctoproject.org/tools-resources/projects/hob'>Hob</ulink>.
+                        The OpenEmbedded build system does not use this
+                        variable.
+                    </note>
                 </para>
 
                 <para>
@@ -1013,8 +1021,8 @@
                     using the
                     <ulink url='https://www.yoctoproject.org/tools-resources/projects/hob'>Hob</ulink>.
                     <note>
-                        When building an image outside of Hob, this variable
-                        is ignored.
+                        When building an image outside of Hob, the OpenEmbedded
+                        build system ignores this variable.
                     </note>
                 </para>
 
-- 
cgit v1.1