From owner-cvs-src@FreeBSD.ORG Thu Aug 31 20:33:08 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 44E8B16A4E0; Thu, 31 Aug 2006 20:33:08 +0000 (UTC) (envelope-from gad@FreeBSD.org) Received: from smtp7.server.rpi.edu (smtp7.server.rpi.edu [128.113.2.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id A785D43D6D; Thu, 31 Aug 2006 20:33:03 +0000 (GMT) (envelope-from gad@FreeBSD.org) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp7.server.rpi.edu (8.13.1/8.13.1) with ESMTP id k7VKWwxv019941; Thu, 31 Aug 2006 16:33:00 -0400 Mime-Version: 1.0 Message-Id: In-Reply-To: <200608311258.OAA23536@galaxy.hbg.de.ao-srv.com> References: <200608311258.OAA23536@galaxy.hbg.de.ao-srv.com> Date: Thu, 31 Aug 2006 16:32:57 -0400 To: Helge Oldach From: Garance A Drosehn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-CanItPRO-Stream: default X-RPI-SA-Score: undef - spam-scanning disabled X-Scanned-By: CanIt (www . canit . ca) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@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 20:33:08 -0000 At 2:58 PM +0200 8/31/06, Helge Oldach wrote: >Roman Kurakin: > > I suggest to make these files the way which would encourage peoples > > to keep example part, for example, under working part. Example will > > be still in the file, it will not bother admin, cause it do not > > cover essential part of the file, and will simplify merging. > >So, with the benefit of easing merging for committers, we end up >with two separate files for the end users (and sysadmins) - one >"example file" and one "tru config file". IMHO this sounds like >complicating matters. I think you misunderstand the goal. This is meant to benefit every single user who *updates* FreeBSD. That is a much larger audience than committers. This split has nothing to do with merging changes into the FreeBSD source repository. The merge we are talking about is the step where every FreeBSD user runs 'mergemaster' (or something equivalent) to bring in important changes to files under /etc, without losing all the important localizations that every sysadmin has to do. It effects every user who ever does a 'cd /usr/src ; make installworld'. -- Garance Alistair Drosehn = drosehn@rpi.edu Senior Systems Programmer or gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA