From owner-svn-doc-all@FreeBSD.ORG  Thu Jan 24 20:27:25 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2BBF337F;
 Thu, 24 Jan 2013 20:27:25 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EE49A2D5;
 Thu, 24 Jan 2013 20:27:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OKROi0073227;
 Thu, 24 Jan 2013 20:27:24 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OKROLb073226;
 Thu, 24 Jan 2013 20:27:24 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301242027.r0OKROLb073226@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 24 Jan 2013 20:27:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40739 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jan 2013 20:27:25 -0000

Author: wblock
Date: Thu Jan 24 20:27:24 2013
New Revision: 40739
URL: http://svnweb.freebsd.org/changeset/doc/40739

Log:
  Force an empty make.conf in freebsd-update section custom kernel
  instructions.

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Jan 24 18:07:39 2013	(r40738)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Jan 24 20:27:24 2013	(r40739)
@@ -431,7 +431,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		installed from the sources:</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel</userinput>
+&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null</userinput>
 &prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput>
 &prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen>
 
@@ -440,8 +440,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		by <command>freebsd-update</command>, the
 		<filename>GENERIC</filename> configuration file must not
 		have been modified in any way.  It is also suggested that
-		it is built without any other special options (preferably
-		with an empty <filename>/etc/make.conf</filename>).</para>
+		it is built without any other special options.</para>
 	    </listitem>
 	  </itemizedlist>
 
@@ -479,7 +478,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		installed from the sources:</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make kernel</userinput></screen>
+&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null</userinput></screen>
 
 	      <para>For this kernel to be identified as the
 		<literal>GENERIC</literal> kernel by
@@ -487,8 +486,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		<filename>GENERIC</filename> configuration file must
 		not have been modified in any way.  It is also
 		suggested that the kernel is built without any other
-		special options, preferably with an empty
-		<filename>/etc/make.conf</filename>.</para>
+		special options.</para>
 	    </listitem>
 	  </itemizedlist>