From owner-freebsd-doc  Fri Sep 27 10:50:12 2002
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 13CDC37B401
	for <freebsd-doc@hub.freebsd.org>; Fri, 27 Sep 2002 10:50:11 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C59C743E86
	for <freebsd-doc@hub.freebsd.org>; Fri, 27 Sep 2002 10:50:10 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8RHoACo084605
	for <freebsd-doc@freefall.freebsd.org>; Fri, 27 Sep 2002 10:50:10 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8RHoAvD084604;
	Fri, 27 Sep 2002 10:50:10 -0700 (PDT)
Date: Fri, 27 Sep 2002 10:50:10 -0700 (PDT)
Message-Id: <200209271750.g8RHoAvD084604@freefall.freebsd.org>
To: freebsd-doc@FreeBSD.org
Cc: 
From: "Bruce A. Mah" <bmah@FreeBSD.ORG>
Subject: Re: docs/43430: Documentation incorrect in /usr/src/Makefile 
Reply-To: "Bruce A. Mah" <bmah@FreeBSD.ORG>
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org

The following reply was made to PR docs/43430; it has been noted by GNATS.

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--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message