From owner-cvs-all@FreeBSD.ORG  Wed Aug 30 11:27:58 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D38D216A4DD;
	Wed, 30 Aug 2006 11:27:58 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 63C3543D45;
	Wed, 30 Aug 2006 11:27:58 +0000 (GMT) (envelope-from des@des.no)
Received: from tim.des.no (localhost [127.0.0.1])
	by spam.des.no (Postfix) with ESMTP id DBCB82086;
	Wed, 30 Aug 2006 13:27:53 +0200 (CEST)
X-Spam-Tests: AWL
X-Spam-Learn: disabled
X-Spam-Score: 0.0/3.0
X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on tim.des.no
Received: from dwp.des.no (des.no [80.203.243.180])
	by tim.des.no (Postfix) with ESMTP id CAD3F2082;
	Wed, 30 Aug 2006 13:27:53 +0200 (CEST)
Received: by dwp.des.no (Postfix, from userid 1001)
	id DC923B84E; Wed, 30 Aug 2006 13:27:59 +0200 (CEST)
From: des@des.no (Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?=)
To: Ruslan Ermilov <ru@FreeBSD.org>
References: <200608290920.k7T9KmV9067843@repoman.freebsd.org>
Date: Wed, 30 Aug 2006 13:27:59 +0200
In-Reply-To: <200608290920.k7T9KmV9067843@repoman.freebsd.org> (Ruslan
	Ermilov's message of "Tue, 29 Aug 2006 09:20:48 +0000 (UTC)")
Message-ID: <86zmdmfoow.fsf@dwp.des.no>
User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/etc hosts.allow
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Aug 2006 11:27:58 -0000

Ruslan Ermilov <ru@FreeBSD.org> writes:
>   Modified files:
>     etc                  hosts.allow
>   Log:
>   Comment out lines that use example addresses and example.com names so
>   that local changes can be made more easily (without having to comment
>   these lines, and making the diff more readable).

That reminds me - /etc/hosts is another file that mergemaster often
trips over.  The comments and examples it contains should be moved to
the appropriate man page(s) if they aren't there already.  In fact, we
should probably remove the file from the tree, and just have
sysinstall create one at install time.

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