From owner-svn-doc-all@FreeBSD.ORG  Wed Apr  9 14:32:07 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 662F6B2E;
 Wed,  9 Apr 2014 14:32:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 531621FCB;
 Wed,  9 Apr 2014 14:32:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39EW77V075280;
 Wed, 9 Apr 2014 14:32:07 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39EW7cT075279;
 Wed, 9 Apr 2014 14:32:07 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201404091432.s39EW7cT075279@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 9 Apr 2014 14:32:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44504 - 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.17
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: Wed, 09 Apr 2014 14:32:07 -0000

Author: dru
Date: Wed Apr  9 14:32:06 2014
New Revision: 44504
URL: http://svnweb.freebsd.org/changeset/doc/44504

Log:
  As per discussion on freebsd-doc, add -iF to second instance of
  mergemaster.
  
  Sponsored by:	iXsystems

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	Wed Apr  9 14:28:58 2014	(r44503)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Apr  9 14:32:06 2014	(r44504)
@@ -1641,7 +1641,7 @@ before running "/usr/sbin/freebsd-update
 	<step>
 	  <para>Update any remaining configuration files.</para>
 
-	  <screen>&prompt.root; <userinput>mergemaster</userinput></screen>
+	  <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen>
 	</step>
 
 	<step>