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

[Dru Lavigne]

Author: dru
Date: Fri Mar  7 18:38:41 2014
New Revision: 44183
URL: http://svnweb.freebsd.org/changeset/doc/44183

Log:
  Edit needed to close PR.
  
  PR: 186625
  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	Fri Mar  7 18:34:22 2014	(r44182)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Fri Mar  7 18:38:41 2014	(r44183)
@@ -1641,7 +1641,7 @@ before running "/usr/sbin/freebsd-update
 	<step>
 	  <para>Update any remaining configuration files.</para>
 
-	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
+	  <screen>&prompt.root; <userinput>mergemaster</userinput></screen>
 	</step>
 
 	<step>