From 793491426677f9978e28cba137f215abbc57b77a Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 22 Jan 2012 23:42:59 +0000
Subject: [PATCH] Remove instructions in case the -p option of mergemaster(8)
 is not present, it is in all supported releases.

Idea taken from http://wiki.freebsd.org/DocIdeaList

Reviewed by:	bcr
Approved by:	dougb
---
 en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index 56108c9e5f..5e4675c11c 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -2122,13 +2122,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	pre-buildworld mode by providing the <option>-p</option> option.
 	This will compare only those files that are essential for the success
 	of <maketarget>buildworld</maketarget> or
-	<maketarget>installworld</maketarget>.  If your old version of
-	<command>mergemaster</command> does not support <option>-p</option>,
-	use the new version in the source tree when running for the first
-	time:</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
-&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
+	<maketarget>installworld</maketarget>.</para>
 
       <tip>
 	<para>If you are feeling particularly paranoid, you can check your