From owner-freebsd-doc@FreeBSD.ORG  Wed Apr  9 14:08:20 2014
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 98F29DC2
 for <freebsd-doc@FreeBSD.org>; Wed,  9 Apr 2014 14:08:20 +0000 (UTC)
Received: from mail1.canodus2.canodus.be (mail1.canodus2.canodus.be
 [83.149.89.9]) by mx1.freebsd.org (Postfix) with ESMTP id 5B1021BD1
 for <freebsd-doc@FreeBSD.org>; Wed,  9 Apr 2014 14:08:20 +0000 (UTC)
Received: by mail1.canodus2.canodus.be (Postfix, from userid 65534)
 id C35C432AD54; Wed,  9 Apr 2014 16:08:18 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 mail1.canodus2.canodus.be
X-Spam-Level: 
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED
 autolearn=unavailable autolearn_force=no version=3.4.0
Received: from [192.168.1.7] (d51532D1F.access.telenet.be [81.83.45.31])
 by mail1.canodus2.canodus.be (Postfix) with ESMTPSA id D1FA032ACA2;
 Wed,  9 Apr 2014 16:08:17 +0200 (CEST)
Message-ID: <1397052497.5416.30.camel@debian.wout-t440s>
Subject: Re: Mistake in handbook 23.6 Rebuilding world
From: Wout =?ISO-8859-1?Q?Decr=E9?= <wout@canodus.be>
To: Dru Lavigne <dru@freebsd.org>
Date: Wed, 09 Apr 2014 16:08:17 +0200
In-Reply-To: <1397051698.88840.YahooMailNeo@web184901.mail.gq1.yahoo.com>
References: <f331d59d74ff81dfce46267b23744687@angst.csh.rit.edu>
 <1397050965.5416.26.camel@debian.wout-t440s>
 <1397051698.88840.YahooMailNeo@web184901.mail.gq1.yahoo.com>
Organization: Canodus
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.8.5-2+b3 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Cc: "freebsd-doc@FreeBSD.org" <freebsd-doc@FreeBSD.org>,
 Kevin Thompson <antiduh@csh.rit.edu>
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Wed, 09 Apr 2014 14:08:20 -0000

On Wed, 2014-04-09 at 06:54 -0700, Dru Lavigne wrote:
> 
> >Having the -i and -F options is something I would like to see too, or at
> >least offered in a <tip>.
> 
> 
> 
> Does changing that line to the following make sense? If so, I'll commit it.
> 
> # mergemaster -piF

No, the second mergemaster command should not include the -p option.

# mergemaster -p

(make installworld)

# mergemaster -iF

> 
> Cheers,
> 
> Dru
>