From owner-freebsd-doc@FreeBSD.ORG  Wed Apr  9 13:51:59 2014
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7FAC42DB
 for <freebsd-doc@FreeBSD.org>; Wed,  9 Apr 2014 13:51:59 +0000 (UTC)
Received: from mail1.canodus2.canodus.be (mail1.canodus2.canodus.be
 [83.149.89.9]) by mx1.freebsd.org (Postfix) with ESMTP id 4485D1A33
 for <freebsd-doc@FreeBSD.org>; Wed,  9 Apr 2014 13:51:59 +0000 (UTC)
Received: by mail1.canodus2.canodus.be (Postfix, from userid 65534)
 id 78E4632ACCD; Wed,  9 Apr 2014 15:42:45 +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 495AC32AC50;
 Wed,  9 Apr 2014 15:42:45 +0200 (CEST)
Message-ID: <1397050965.5416.26.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: Kevin Thompson <antiduh@csh.rit.edu>
Date: Wed, 09 Apr 2014 15:42:45 +0200
In-Reply-To: <f331d59d74ff81dfce46267b23744687@angst.csh.rit.edu>
References: <f331d59d74ff81dfce46267b23744687@angst.csh.rit.edu>
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
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 13:51:59 -0000

On Wed, 2014-04-09 at 09:06 -0400, Kevin Thompson wrote:
> Howdy folks,
> 
> I think there is a mistake in this document:
>      http://www5.us.freebsd.org/doc/handbook/makeworld.html
> 
> In:
>   - Section 23.6.1 "Overview of Process"
>   - Procedure 23.2 "Overview of Build World Process"
>   - Step 9 "Update any remaining configuration files."
> 
> the command line given for mergemaster is 'mergemaster -p' - this looks 
> like copy-pasta from step 7, that command line option isn't appropriate 
> for /finishing/ the config merge.
> 
> Shouldn't the command be something like 'mergemaster -iF'?

I reported this some time ago, and it was fixed (r44183), seems like the
mirror of the Handbook you use is not yet updated.

Having the -i and -F options is something I would like to see too, or at
least offered in a <tip>.

Cheers

> 
> --Kevin
> 
> 
> _______________________________________________
> freebsd-doc@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-doc
> To unsubscribe, send any mail to "freebsd-doc-unsubscribe@freebsd.org"