From owner-cvs-src@FreeBSD.ORG  Tue Feb 17 23:12:29 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A3D1F16A4CE; Tue, 17 Feb 2004 23:12:29 -0800 (PST)
Received: from smtp.des.no (flood.des.no [217.116.83.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 70BC343D1F; Tue, 17 Feb 2004 23:12:29 -0800 (PST)
	(envelope-from des@des.no)
Received: by smtp.des.no (Pony Express, from userid 666)
	id E18AA5309; Wed, 18 Feb 2004 08:12:27 +0100 (CET)
Received: from dwp.des.no (des.no [80.203.228.37])
	by smtp.des.no (Pony Express) with ESMTP
	id 503F35308; Wed, 18 Feb 2004 08:12:21 +0100 (CET)
Received: by dwp.des.no (Postfix, from userid 2602)
	id D442033C6F; Wed, 18 Feb 2004 08:12:20 +0100 (CET)
To: Nate Lawson <nate@root.org>
References: <20040217203852.724BE16A567@hub.freebsd.org>
	<20040217125043.N30568@root.org>
	<20040217215309.GA31288@dragon.nuxi.com>
	<20040217143034.B31176@root.org>
	<20040217230348.GB31288@dragon.nuxi.com> <4032AB2D.60008@acm.org>
	<20040217160751.Q31680@root.org>
From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=)
Date: Wed, 18 Feb 2004 08:12:20 +0100
In-Reply-To: <20040217160751.Q31680@root.org> (Nate Lawson's message of
 "Tue, 17 Feb 2004 16:15:30 -0800 (PST)")
Message-ID: <xzpy8r0uai3.fsf@dwp.des.no>
User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on flood.des.no
X-Spam-Level: 
X-Spam-Status: No, hits=0.0 required=5.0 tests=AWL autolearn=no version=2.63
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: wes@freebsd.org
cc: cvs-all@FreeBSD.org
cc: Tim Kientzle <kientzle@acm.org>
Subject: Re: cvs commit: src/share/man/man4 acpi.4
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2004 07:12:29 -0000

Nate Lawson <nate@root.org> writes:
> If David chooses to put his custom values in device.hints, he can hand
> merge his changes in whenever he updates (for example, when a new driver
> is imported that needs hints and GENERIC.hints is updated).

If 'make distribution' installs GENERIC.hints as /boot/device.hints,
mergemaster will take care of the rest.

DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no