From 8ced82e8b245df8e49ce2b366ae192ef30c5a169 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 2 Mar 2015 10:42:58 -0800
Subject: kernel-dev, ref-manual: Scrubbed out the KBRANCH_DEFAULT variable.

This variable is out.  There were some references to deal with.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
(From yocto-docs rev: fcdd5de04c722ebde2d3f236310c46a251cf1afc)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/kernel-dev/kernel-dev-advanced.xml | 14 +++++---------
 documentation/ref-manual/ref-variables.xml       | 18 ------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'documentation')

diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 283f483..7850760 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/documentation/kernel-dev/kernel-dev-advanced.xml
@@ -66,19 +66,15 @@
         <literallayout class='monospaced'>
      <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH'>KBRANCH</ulink>
      <ulink url='&YOCTO_DOCS_REF_URL;#var-KERNEL_FEATURES'>KERNEL_FEATURES</ulink>
-     <ulink url='&YOCTO_DOCS_REF_URL;#var-KBRANCH_DEFAULT'>KBRANCH_DEFAULT</ulink>
      <ulink url='&YOCTO_DOCS_REF_URL;#var-LINUX_KERNEL_TYPE'>LINUX_KERNEL_TYPE</ulink>
         </literallayout>
-        <filename>KBRANCH_DEFAULT</filename> defines the Linux kernel source
-        repository's default branch to use to build the Linux kernel.
-        The value is used as the default for <filename>KBRANCH</filename>, which
-        can define an alternate branch typically with a machine override as
-        follows:
+        <filename>KBRANCH</filename> defines the Linux kernel source
+        repository's branch to use to build the Linux kernel.
+        You can use the value to define an alternate branch typically with a
+        machine override as follows:
         <literallayout class='monospaced'>
-     KBRANCH_fri2 = "standard/fri2"
+     KBRANCH_fri2 ?= "standard/fri2"
         </literallayout>
-        Unless you specify otherwise, <filename>KBRANCH_DEFAULT</filename>
-        initializes to "master".
     </para>
 
     <para>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 5271dcf..6bcbbb3 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -5802,24 +5802,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-KBRANCH_DEFAULT'><glossterm>KBRANCH_DEFAULT</glossterm>
-            <info>
-                KBRANCH_DEFAULT[doc] = "Defines the Linux kernel source repository's default branch used to build the Linux kernel. Unless you specify otherwise, the variable initializes to 'master'."
-            </info>
-            <glossdef>
-                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" />
-                    Defines the Linux kernel source repository's default
-                    branch used to build the Linux kernel.
-                    The <filename>KBRANCH_DEFAULT</filename> value is
-                    the default value for
-                    <link linkend='var-KBRANCH'><filename>KBRANCH</filename></link>.
-                    Unless you specify otherwise,
-                    <filename>KBRANCH_DEFAULT</filename> initializes to
-                    "master".
-                </para>
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-KERNEL_EXTRA_ARGS'><glossterm>KERNEL_EXTRA_ARGS</glossterm>
             <info>
                 KERNEL_EXTRA_ARGS[doc] = "Specifies additional make command-line arguments the OpenEmbedded build system passes on when compiling the kernel."
-- 
cgit v1.1