From owner-p4-projects@FreeBSD.ORG  Sun Jan 22 16:33:40 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13C96106567B; Sun, 22 Jan 2012 16:33:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A41DB1065670
	for <perforce@FreeBSD.org>; Sun, 22 Jan 2012 16:33:39 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 918AC8FC0A
	for <perforce@FreeBSD.org>; Sun, 22 Jan 2012 16:33:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0MGXd9f025627
	for <perforce@FreeBSD.org>; Sun, 22 Jan 2012 16:33:39 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0MGXdDj025624
	for perforce@freebsd.org; Sun, 22 Jan 2012 16:33:39 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 22 Jan 2012 16:33:39 GMT
Message-Id: <201201221633.q0MGXdDj025624@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 205007 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jan 2012 16:33:40 -0000

http://p4web.freebsd.org/@@205007?ac=10

Change 205007 by rene@rene_acer on 2012/01/22 16:33:17

	Remove the instructions in case mergemaster(8) has no -p option,
	the oldest supported release (7.3) has it.	
	
	Idea from http://wiki.freebsd.org/DocIdeaList

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 (text+ko) ====

@@ -2122,13 +2122,7 @@
 	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