From owner-freebsd-doc Fri May 10 7:40:15 2002 Delivered-To: freebsd-doc@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3ACF437B407 for ; Fri, 10 May 2002 07:40:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AEe2Y92249; Fri, 10 May 2002 07:40:02 -0700 (PDT) (envelope-from gnats) Received: from Kain.sumuk.de (Kain.sumuk.de [213.221.86.114]) by hub.freebsd.org (Postfix) with ESMTP id 84CE737B400 for ; Fri, 10 May 2002 07:38:58 -0700 (PDT) Received: from Moses.earth.sol (Moses.earth.sol [192.168.1.1]) by Kain.sumuk.de (8.11.6/8.11.6) with ESMTP id g4AEct052991 for ; Fri, 10 May 2002 16:38:55 +0200 (CEST) (envelope-from martin@sumuk.de) Received: (from vincent@localhost) by Moses.earth.sol (8.11.6/8.11.6) id g4AEcqw22650; Fri, 10 May 2002 16:38:53 +0200 (CEST) (envelope-from vincent) Message-Id: <200205101438.g4AEcqw22650@Moses.earth.sol> Date: Fri, 10 May 2002 16:38:53 +0200 (CEST) From: Martin Heinen Reply-To: Martin Heinen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/37925: [PATCH] cutting-edge: clarify mergemaster discussion Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 37925 >Category: docs >Synopsis: [PATCH] cutting-edge: clarify mergemaster discussion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Fri May 10 07:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Martin Heinen >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD Moses.earth.sol 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Dec 22 07:35:30 CET 2001 toor@Moses.earth.sol:/usr/obj/usr/src/sys/MOSES i386 >Description: When discussing the update of configuration files, the handbook suggests to use mergemaster and in the same sentence suggests to skip over the following discussion of mergemaster. Also note that only half of the section is relevant to the user, regardless of which method (mergemaster or manual update) is chosen. Introduced two new to deal with mergemaster and the manual update. Placed the link to skip the discussion in the section dealing with the manal update method since this is the deprecated one. >How-To-Repeat: Read 'Update Files Not Updated by make world' in the chapter 'The Cutting Edge'. >Fix: Index: chapter.sgml =================================================================== RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v retrieving revision 1.120 diff -u -r1.120 chapter.sgml --- chapter.sgml 4 May 2002 14:22:34 -0000 1.120 +++ chapter.sgml 10 May 2002 13:59:41 -0000 @@ -1060,16 +1060,16 @@ Remaking the world will not update certain directories (in particular, /etc, /var and /usr) with new or changed configuration files. - mergemaster The simplest way to update these files is to use &man.mergemaster.8;, though it is possible to do it manually - if you would prefer to do that. We strongly recommend you - use &man.mergemaster.8;, however, and if you do then you - can skip forward to the next - section, since &man.mergemaster.8; is described below. - Be sure to make a backup of - /etc in case anything goes wrong. + if you would prefer to do that. Regardless of which way you + choose, be sure to make a backup of /etc in + case anything goes wrong. + + + <command>mergemaster</command> + mergemaster The &man.mergemaster.8; utility is a Bourne script that will aid you in determining the differences between your configuration files @@ -1128,6 +1128,10 @@ prompted for other options. &man.mergemaster.8; will ask if you want to rebuild the password file, run MAKEDEV and finishing up with a removal of the left over temporary files. + + + + Manual Update If you wish to do the update manually, however, you cannot just copy over the files from @@ -1139,6 +1143,10 @@ there are files that should be in /etc that are not in /usr/src/etc. + If you are using &man.mergemaster.8; (as recommended), + you can skip forward to the next + section. + The simplest way to do this by hand is to install the files into a new directory, and then work through them looking for differences. @@ -1281,6 +1289,7 @@ &prompt.root; mkdir /var/tmp/root-`date "+%Y%m%d"` + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message