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 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'documentation/kernel-dev/kernel-dev-advanced.xml')

diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 283f483112..785076026d 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>
-- 
cgit v1.2.3-54-g00ecf