From nobody@www.freebsd.org  Thu May 23 21:10:32 2002
Return-Path: <nobody@www.freebsd.org>
Received: from nwww.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id B287D37B403
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 May 2002 21:10:31 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g4O4AVhG032139
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 May 2002 21:10:31 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.2/8.12.2/Submit) id g4O4AVYH032138;
	Thu, 23 May 2002 21:10:31 -0700 (PDT)
Message-Id: <200205240410.g4O4AVYH032138@www.freebsd.org>
Date: Thu, 23 May 2002 21:10:31 -0700 (PDT)
From: Chris Pepper <pepper@rockefeller.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
X-Send-Pr-Version: www-1.0

>Number:         38483
>Category:       i386
>Synopsis:       >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 23 21:20:01 PDT 2002
>Closed-Date:    Wed Jun 05 18:01:08 PDT 2002
>Last-Modified:  Mon Nov 24 12:20:15 PST 2003
>Originator:     Chris Pepper
>Release:        4.5-RELEASE
>Organization:
Rockefeller University
>Environment:
FreeBSD guest.reppep.com 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002     murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC  i386

>Description:
<http://www.freebsd.org/handbook/makeworld.html> says:

Since 4.6-RELEASE you can run  mergemaster(8) in pre-buildworld mode by providing the -p option. This will compare only those files that are essential for the success of buildworld or installworld. If your old version of mergemaster does not support -p, use the new version in the source tree when running for the first time:

Actually, -p is is available before 4.6-RELEASE, but I'm not sure when it appeared.
>How-To-Repeat:

>Fix:
Correct the reference to 4.6-RELEASE with the actual appearance of mergemaster's -p option.
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-docs 
Responsible-Changed-By: johan 
Responsible-Changed-When: Tue Jun 4 17:53:27 PDT 2002 
Responsible-Changed-Why:  
Over to docs. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38483 
State-Changed-From-To: open->closed 
State-Changed-By: bmah 
State-Changed-When: Tue Jun 4 20:04:10 PDT 2002 
State-Changed-Why:  


http://www.freebsd.org/cgi/query-pr.cgi?pr=38483 
State-Changed-From-To: closed->open 
State-Changed-By: bmah 
State-Changed-When: Tue Jun 4 20:06:22 PDT 2002 
State-Changed-Why:  
Argh.  Closed by mistake, sorry about that. 

I'm not 100% sure that anything needs to be done for this PR, since 
generally the handbook and manpages only "count" releases for the 
purposes of changes.  I started closing the PR with a message to that 
effect, but changed my mind. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=38483 

From: Giorgos Keramidas <keramida@FreeBSD.org>
To: bmah@FreeBSD.org
Cc: pepper@rockefeller.edu, bug-followup@FreeBSD.org
Subject: Re: i386/38483: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
Date: Thu, 6 Jun 2002 01:07:08 +0300

 On 2002-06-04 20:08 -0700, bmah@FreeBSD.ORG wrote:
 > Synopsis: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
 > 
 > State-Changed-From-To: closed->open
 > State-Changed-By: bmah
 > State-Changed-When: Tue Jun 4 20:06:22 PDT 2002
 > State-Changed-Why: 
 > Argh.  Closed by mistake, sorry about that.
 > 
 > I'm not 100% sure that anything needs to be done for this PR, since
 > generally the handbook and manpages only "count" releases for the
 > purposes of changes.  I started closing the PR with a message to that
 > effect, but changed my mind.
 
 This PR can be closed.  The -p option of mergemaster appeared in
 revision 1.27 of src/usr.sbin/mergemaster/mergemaster.sh which
 appeared in the repository in Feb 2002.  This is after 4.5-RELEASE.
 The Handbook is correct.  The "first release that mergemaster will
 support the -p option, is going to be 4.6-RELEASE, when that it out."
 
 Giorgos.
 
State-Changed-From-To: open->closed 
State-Changed-By: bmah 
State-Changed-When: Wed Jun 5 18:00:20 PDT 2002 
State-Changed-Why:  
kerimada and I seem to agree that the Handbook is correct as written 
(see audit trail for details). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38483 
Responsible-Changed-From-To: freebsd-docs->freebsd-doc 
Responsible-Changed-By: ceri 
Responsible-Changed-When: Mon Nov 24 12:20:03 PST 2003 
Responsible-Changed-Why:  
Lint Responsible. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38483 
>Unformatted:
