From nobody@FreeBSD.org  Fri Sep 27 10:39:48 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 58B5B37B401
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Sep 2002 10:39:48 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B88843E65
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Sep 2002 10:39:48 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.6/8.12.6) with ESMTP id g8RHdl7R036424
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Sep 2002 10:39:47 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.6/8.12.6/Submit) id g8RHdls7036423;
	Fri, 27 Sep 2002 10:39:47 -0700 (PDT)
Message-Id: <200209271739.g8RHdls7036423@www.freebsd.org>
Date: Fri, 27 Sep 2002 10:39:47 -0700 (PDT)
From: Steve Davidson <stevedav@pacbell.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Documentation incorrect in /usr/src/Makefile
X-Send-Pr-Version: www-1.0

>Number:         43430
>Category:       docs
>Synopsis:       Documentation incorrect in /usr/src/Makefile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 27 10:40:02 PDT 2002
>Closed-Date:    Thu Oct 03 16:43:21 PDT 2002
>Last-Modified:  Thu Oct 03 16:43:21 PDT 2002
>Originator:     Steve Davidson
>Release:        4.6-STABLE (9-27-02) about 4.7 RC2
>Organization:
>Environment:
4.6-STABLE (9-27-02) about 4.7 RC2

>Description:
I did a cvsup of the 4.6 RELENG (STABLE) branch and then read
/usr/src/Makefile and found these instructions:

# For individuals wanting to upgrade their sources (even if only a
# delta of a few days):
#
# 1.  `cd /usr/src'       (or to the directory containing your source tree).
# 2.  `make buildworld'
# 3.  `make buildkernel KERNCONF=YOUR_KERNEL_HERE'     (default is GENERIC).
# 4.  `make installkernel KERNCONF=YOUR_KERNEL_HERE'   (default is GENERIC).
# 5.  `reboot'        (in single user mode: boot -s from the loader prompt).
# 6.  `mergemaster -p'
# 7.  `make installworld'
# 8.  `mergemaster'
# 9.  `reboot'
#

There is no '-p' option to mergemaster; it is difficult to understand what conceptually '-p' would have done if it existed.
>How-To-Repeat:
Have a look at /usr/src/Makefile      
>Fix:
Fix the documentation.
Also elaborate (a little) as to what the steps achieve. 
I can and did read the mergemaster docs so no need to repeat,
but '-p' isn't in the mergemaster docs.
>Release-Note:
>Audit-Trail:

From: "Bruce A. Mah" <bmah@FreeBSD.ORG>
To: Steve Davidson <stevedav@pacbell.net>
Cc: freebsd-gnats-submit@FreeBSD.ORG
Subject: Re: docs/43430: Documentation incorrect in /usr/src/Makefile 
Date: Fri, 27 Sep 2002 10:46:59 -0700

 --==_Exmh_-2019592486P
 Content-Type: text/plain; charset=us-ascii
 
 If memory serves me right, Steve Davidson wrote:
 
 > There is no '-p' option to mergemaster; it is difficult to understand what co
 > nceptually '-p' would have done if it existed.
 
 nimitz:bmah% man mergemaster
 MERGEMASTER(8)          FreeBSD System Manager's Manual         MERGEMASTER(8)
 
 NAME
      mergemaster - merge configuration files, et al during an upgrade
 
 [deletia]
 
      -p          Pre-buildworld mode.  Compares only files known to be essen-
                  tial to the success of {build|install}world, including
                  /etc/make.conf.
 
 [deletia]
 
 nimitz:bmah% uname -a
 FreeBSD nimitz.packetdesign.com 4.7-RC FreeBSD 4.7-RC #43: Mon Sep 23 10:08:47 PDT 2002     root@nimitz.packetdesign.com:/usr/obj/usr/src/sys/NIMITZ  i386
 
 Perhaps you have an old, cached copy of the mergemaster manpage?
 
 Bruce.
 
 
 
 --==_Exmh_-2019592486P
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.0.7 (FreeBSD)
 Comment: Exmh version 2.5+ 20020506
 
 iD8DBQE9lJmT2MoxcVugUsMRArBWAKDSaaXsWpC+pqTjq5o5XEKjO0dE8QCguhkN
 5+lrDvt4g6dEVZF6kOpNsA0=
 =VgQx
 -----END PGP SIGNATURE-----
 
 --==_Exmh_-2019592486P--

From: Marc Fonvieille <blackend@FreeBSD.org>
To: Steve Davidson <stevedav@pacbell.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: docs/43430: Documentation incorrect in /usr/src/Makefile
Date: Fri, 27 Sep 2002 19:51:09 +0200

 On Fri, Sep 27, 2002 at 10:39:47AM -0700, Steve Davidson wrote:
 > There is no '-p' option to mergemaster; it is difficult to understand what conceptually '-p' would have done if it existed.
 > >How-To-Repeat:
 > Have a look at /usr/src/Makefile      
 > >Fix:
 > Fix the documentation.
 > Also elaborate (a little) as to what the steps achieve. 
 > I can and did read the mergemaster docs so no need to repeat,
 > but '-p' isn't in the mergemaster docs.
 
 From man mergemaster:
 
  -p          Pre-buildworld mode.  Compares only files known to be essen
              tial to the success of {build|install}world, including
 	     /etc/make.conf.
 
 Marc

From: swear@attbi.com (Gary W. Swearingen)
To: Steve Davidson <stevedav@pacbell.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: docs/43430: Documentation incorrect in /usr/src/Makefile
Date: 27 Sep 2002 13:13:24 -0700

 Steve Davidson <stevedav@pacbell.net> writes:
 
 > I did a cvsup of the 4.6 RELENG (STABLE) branch and then read
 > /usr/src/Makefile and found these instructions:
 
 But you probably didn't cvsup the ports and update mergemaster.
State-Changed-From-To: open->closed 
State-Changed-By: trhodes 
State-Changed-When: Thu Oct 3 16:42:33 PDT 2002 
State-Changed-Why:  
Closed.  The documentation is fine, perhaps you have an older version? 

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