From owner-cvs-src@FreeBSD.ORG Thu Aug 31 02:35:40 2006 Return-Path: X-Original-To: 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 4E86C16A4E0; Thu, 31 Aug 2006 02:35:40 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6408843D46; Thu, 31 Aug 2006 02:35:38 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (inchoate.gsoft.com.au [203.31.81.25]) (authenticated bits=0) by cain.gsoft.com.au (8.13.5/8.13.4) with ESMTP id k7V2ZXEj048851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 31 Aug 2006 12:05:33 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: cvs-all@freebsd.org Date: Thu, 31 Aug 2006 12:05:32 +0930 User-Agent: KMail/1.9.3 References: <200608290920.k7T9KmV9067843@repoman.freebsd.org> <20060830192456.2497b4bd.trhodes@FreeBSD.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4417029.AGklHevN52"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200608311205.34661.doconnor@gsoft.com.au> X-Spam-Score: -3.331 () ALL_TRUSTED,AWL,BAYES_00 X-Scanned-By: MIMEDefang 2.56 on 203.31.81.10 Cc: Tom Rhodes , src-committers@freebsd.org, Ruslan Ermilov , Garance A Drosehn , cvs-src@freebsd.org Subject: Re: "Chatty" config files in /etc X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2006 02:35:40 -0000 --nextPart4417029.AGklHevN52 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 31 August 2006 10:12, Garance A Drosehn wrote: > These are files which have "too many" helpful comments or examples > in them, and which I have to modify on every single machine I ever > bring up. So *every* time one of these changes, I have to stop and > stare at the diff in the mergemaster step, and 99% of the time the > change is just to fix or improve some comment. And in many cases, > the change is to some line that I remove in my custom copy. Now > all of those changes seem to be good changes, but they are still > an annoyance when it comes to merging in my local changes. This is yet another reason why etcmerge (3 way merge) is more useful for=20 updating configuration files. That said I agree that moving the example files to where examples should li= ve=20 is a good idea. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart4417029.AGklHevN52 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (FreeBSD) iD8DBQBE9kr25ZPcIHs/zowRAuanAJ9lY+KZPRXfIVZ097z3nDT6WF6RCACghq2S VO5Mvp6+bb20rJ95DFljQuY= =Nu7Z -----END PGP SIGNATURE----- --nextPart4417029.AGklHevN52--