svn commit: r44504 - head/en_US.ISO8859-1/books/handbook/cutting-edge

[Dru Lavigne]

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>