From owner-freebsd-doc@FreeBSD.ORG  Sun Mar  2 20:51:52 2008
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: doc@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 015E71065676
	for <doc@freebsd.org>; Sun,  2 Mar 2008 20:51:52 +0000 (UTC)
	(envelope-from bobf@mrp3.com)
Received: from fall-pradero.atl.sa.earthlink.net
	(fall-pradero.atl.sa.earthlink.net [207.69.195.104])
	by mx1.freebsd.org (Postfix) with ESMTP id B87248FC16
	for <doc@freebsd.org>; Sun,  2 Mar 2008 20:51:51 +0000 (UTC)
	(envelope-from bobf@mrp3.com)
Received: from pop03.mail.atl.earthlink.net ([207.69.200.48])
	by fall-pradero.atl.sa.earthlink.net with esmtp (Exim 4.34)
	id 1JVuME-0005GH-Ot
	for doc@freebsd.org; Sun, 02 Mar 2008 15:00:26 -0500
Received: from user-112v223.biz.mindspring.com ([66.47.136.67]
	helo=[192.168.122.63])
	by pop03.mail.atl.earthlink.net with esmtp (Exim 3.36 #1)
	id 1JVuMD-0005Bz-00
	for doc@freebsd.org; Sun, 02 Mar 2008 15:00:25 -0500
Message-ID: <47CB07B9.6060200@mrp3.com>
Date: Sun, 02 Mar 2008 12:02:01 -0800
From: Bob Frazier <bobf@mrp3.com>
User-Agent: Thunderbird 2.0.0.9 (Windows/20071031)
MIME-Version: 1.0
To: doc@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: 
Subject: recommended addition for section 23.4.11.1 (mergemaster)
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Mar 2008 20:51:52 -0000

since using mergemaster with default arguments (as specified in the 
handbook) can create a LARGE amount of 'unnecessary prompting' for 
certain kinds of upgrades (let's say going from 6-STABLE to 7-STABLE), I 
recommend adding the following paragraph to section 23.4.11.1 (or at 
least something similar to it).


"For experienced users, you may want to minimize the amount of prompting 
that mergemaster can generate, especially when upgrading major 
revisions, or when an update has not been performed in some time.  To 
automatically update files that have not been modified, use the '-U' 
option.  To automatically include new files without prompting you to add 
them, include the '-i' option.  Using 'mergemaster -U -i' will greatly 
speed up the process for users that do not make major changes to the 
files in '/etc', but at the expense of not being able to control every 
single modification that is made."