From owner-freebsd-current  Wed Jan 28 19:21:43 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id TAA03146
          for current-outgoing; Wed, 28 Jan 1998 19:21:43 -0800 (PST)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from taliesin.cs.ucla.edu (Taliesin.CS.UCLA.EDU [131.179.96.166])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id TAA03057
          for <freebsd-current@freebsd.org>; Wed, 28 Jan 1998 19:21:35 -0800 (PST)
          (envelope-from scottm@mordred.cs.ucla.edu)
Received: (qmail 10703 invoked from network); 29 Jan 1998 03:21:10 -0000
Received: from mordred.cs.ucla.edu (131.179.48.34)
  by taliesin.cs.ucla.edu with SMTP; 29 Jan 1998 03:21:10 -0000
Received: (from scottm@localhost)
	by mordred.cs.ucla.edu (8.8.8/8.8.8) id TAA05358
	for freebsd-current@freebsd.org; Wed, 28 Jan 1998 19:21:23 -0800 (PST)
	(envelope-from scottm)
Date: Wed, 28 Jan 1998 19:21:23 -0800 (PST)
From: Scott Michel <scottm@cs.ucla.edu>
Message-Id: <199801290321.TAA05358@mordred.cs.ucla.edu>
To: freebsd-current@FreeBSD.ORG
Subject: canonical way of merging /etc with /usr/src/etc
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

I've searched the mailing list archives. What is the socially accepted,
politcally correct way of upgrading /etc from /usr/src/etc?

Yes, I know I have to save the original first and hand merge a lot of
my original configuration.


-scooter