From owner-freebsd-current@FreeBSD.ORG  Sat Aug 30 03:47:57 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF8F016A4BF
	for <freebsd-current@freebsd.org>;
	Sat, 30 Aug 2003 03:47:57 -0700 (PDT)
Received: from rwcrmhc13.comcast.net (rwcrmhc13.comcast.net [204.127.198.39])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F1E443FEA
	for <freebsd-current@freebsd.org>;
	Sat, 30 Aug 2003 03:47:57 -0700 (PDT)
	(envelope-from DougB@freebsd.org)
Received: from master.dougb.net
	(12-234-22-23.client.attbi.com[12.234.22.23](untrusted sender))
	by comcast.net (rwcrmhc13) with SMTP
	id <2003083010465301500gjln4e>; Sat, 30 Aug 2003 10:46:53 +0000
Date: Sat, 30 Aug 2003 03:46:53 -0700 (PDT)
From: Doug Barton <DougB@FreeBSD.org>
To: Poul-Henning Kamp <phk@phk.freebsd.dk>
In-Reply-To: <5227.1062237821@critter.freebsd.dk>
Message-ID: <20030830034243.L15016@znfgre.qbhto.arg>
References: <5227.1062237821@critter.freebsd.dk>
Organization: http://www.FreeBSD.org/
X-message-flag: Outlook -- Not just for spreading viruses anymore!
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: freebsd-current@freebsd.org
Subject: Re: cvs commit: src/gnu/usr.bin Makefile src/lib Makefile src/sbin
 Makefile src/usr.bin Makefile src/usr.sbin Makefile 
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Aug 2003 10:47:57 -0000

On Sat, 30 Aug 2003, Poul-Henning Kamp wrote:

> In message <20030830025536.V15016@znfgre.qbhto.arg>, Doug Barton writes:
> >Poul-Henning,
> >
> >Please don't forget to update src/share/examples/etc/make.conf
> >accordingly.
>
> Hmm, so this stuff is documented both in make.conf(5) and an examples
> file ?  Sounds like one place too many to me.

Well, there's "always" been an example make.conf file. In previous
incarnations it's lived in /etc, then /etc/defaults. I also agree with
the previous poster that it's useful to have such an example, and
mergemaster uses it for the -p option.

Doug

-- 

    This .signature sanitized for your protection