From owner-freebsd-doc@FreeBSD.ORG  Mon Feb  9 09:16:51 2004
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 72CFD16A4CE; Mon,  9 Feb 2004 09:16:51 -0800 (PST)
Received: from abigail.blackend.org (blackend.org [212.11.35.229])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A677643D1D; Mon,  9 Feb 2004 09:16:50 -0800 (PST)
	(envelope-from marc@blackend.org)
Received: from abigail.blackend.org (localhost [127.0.0.1])
	by abigail.blackend.org (8.12.9/8.12.3) with ESMTP id i19HGmDR032849;
	Mon, 9 Feb 2004 18:16:48 +0100 (CET)
	(envelope-from marc@abigail.blackend.org)
Received: (from marc@localhost)
	by abigail.blackend.org (8.12.9/8.12.3/Submit) id i19HGmni032848;
	Mon, 9 Feb 2004 18:16:48 +0100 (CET)
	(envelope-from marc)
Date: Mon, 9 Feb 2004 18:16:48 +0100
From: Marc Fonvieille <blackend@FreeBSD.org>
To: Tom Rhodes <trhodes@FreeBSD.org>
Message-ID: <20040209181648.A32715@abigail.blackend.org>
References: <200402071726.i17HQMIo078714@freefall.freebsd.org>
	<20040209104004.13b3e2df@localhost>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <20040209104004.13b3e2df@localhost>;
	from trhodes@FreeBSD.org on Mon, Feb 09, 2004 at 10:40:04AM -0500
X-Useless-Header: blackend.org
X-Operating-System: FreeBSD 4.8-STABLE
cc: freebsd-doc@FreeBSD.org
cc: dougb@FreeBSD.org
cc: Jens Schweikhardt <schweikh@FreeBSD.org>
Subject: Re: docs/62484: (mergemaster) does pre-buildworld really mean that?
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 09 Feb 2004 17:16:51 -0000

On Mon, Feb 09, 2004 at 10:40:04AM -0500, Tom Rhodes wrote:
> On Sat, 7 Feb 2004 09:26:22 -0800 (PST)
> Jens Schweikhardt <schweikh@freebsd.org> wrote:
> 
> > Synopsis: (mergemaster) does pre-buildworld really mean that?
> > 
> > Responsible-Changed-From-To: freebsd-doc->dougb
> > Responsible-Changed-By: schweikh
> > Responsible-Changed-When: Sat Feb 7 09:25:28 PST 2004
> > Responsible-Changed-Why: 
> > Over to mergemaster maintainer.
> 
> I think this is a -doc issue as mergemaster isn't the problem.  The
> handbook should be adjusted.
>

>From my point of view there is nothing wrong in the Handbook.  This
later tells the same thing as UPDATING.

And mergemaster(8) says:

 -p          Pre-buildworld mode.  Compares only files known to be essen-
             tial to the success of {build|install}world, including
	     /etc/make.conf.

(note "{build|install}world")

We use -p for installworld in the UPDATING/Handbook examples, since
-p for buildworld would be used for special cases that would be
documented in UPDATING.

I'd say the only (maybe) confusing thing is the name of the -p option.

Marc