From wblock@wonkity.com  Sun Mar 24 13:05:55 2002
Return-Path: <wblock@wonkity.com>
Received: from wonkity.com (wonkity.com [63.93.4.4])
	by hub.freebsd.org (Postfix) with ESMTP id C319E37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2002 13:05:54 -0800 (PST)
Received: from wonkity.com (localhost.wonkity.com [127.0.0.1])
	by wonkity.com (8.12.1/8.11.6) with ESMTP id g2OL5ruF047168
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2002 14:05:54 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Received: (from wblock@localhost)
	by wonkity.com (8.12.1/8.12.1/Submit) id g2OL5rJ5047167;
	Sun, 24 Mar 2002 14:05:53 -0700 (MST)?g
	(envelope-from wblock)
Message-Id: <200203242105.g2OL5rJ5047167@wonkity.com>
Date: Sun, 24 Mar 2002 14:05:53 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
Reply-To: Warren Block <wblock@wonkity.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Handbook section 19.4.10 skips over mergemaster step
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36263
>Category:       docs
>Synopsis:       Handbook section 19.4.10 skips over mergemaster step
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    trhodes
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 24 13:10:00 PST 2002
>Closed-Date:    Thu Mar 28 18:39:39 PST 2002
>Last-Modified:  Thu Mar 28 18:39:39 PST 2002
>Originator:     Warren Block
>Release:        Handbook 2nd Edition
>Organization:
none
>Environment:
Paper and online version
>Description:
Section 19.4.10 of the Handbook (2nd Edition) skips over the use of
mergemaster.  It details steps to use instead of mergemaster, but
mergemaster instructions are not included.
>How-To-Repeat:
See section 19.4.10.
>Fix:
Add a "Using mergemaster" title and mergemaster instructions before existing
instructions in 19.4.10, and show a mergemaster command line and usage
instructions.
De-emphasize the manual merging method section, or at least break it from
the mergemaster section with a title.
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->trhodes 
Responsible-Changed-By: trhodes 
Responsible-Changed-When: Thu Mar 28 11:53:59 PST 2002 
Responsible-Changed-Why:  

I have already written 3 paragraphs for this pr, and will submit 
a patch for review in a day or so.  Thanks for pointing this out. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36263 

From: Tom Rhodes <darklogik@pittgoth.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/36263: [PATCH for review] mergemaster section
Date: Thu, 28 Mar 2002 18:04:12 -0500

 --=.Ei'hU9sxSPz0g)
 Content-Type: multipart/mixed;
  boundary="Multipart_Thu__28_Mar_2002_18:04:12_-0500_081a6a00"
 
 
 --Multipart_Thu__28_Mar_2002_18:04:12_-0500_081a6a00
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 I have created a patch and wish it be reviewed by my fellow -doc
 hackers.  If you have any questions, please lot me know ;)
 
 Thanks
 
 -- 
 Tom (Darklogik) Rhodes
 www.FreeBSD.org  -The Power To Serve
 www.Pittgoth.com -Pittgoth Discussion Portal
 trhodes@ {Pittgoth.com, FreeBSD.org}
 
 --Multipart_Thu__28_Mar_2002_18:04:12_-0500_081a6a00
 Content-Type: application/octet-stream;
  name="merge.diff"
 Content-Disposition: attachment;
  filename="merge.diff"
 Content-Transfer-Encoding: base64
 
 ZGlmZiAtcnVOIGhhbmRib29rL2N1dHRpbmctZWRnZS9jaGFwdGVyLnNnbWwgaGFuZGJvb2submV3
 L2N1dHRpbmctZWRnZS9jaGFwdGVyLnNnbWwKLS0tIGhhbmRib29rL2N1dHRpbmctZWRnZS9jaGFw
 dGVyLnNnbWwJVHVlIE1hciAyNiAyMDoxNjo0OCAyMDAyCisrKyBoYW5kYm9vay5uZXcvY3V0dGlu
 Zy1lZGdlL2NoYXB0ZXIuc2dtbAlUaHUgTWFyIDI4IDE3OjU1OjQzIDIwMDIKQEAgLTEwNjcsMTEg
 KzEwNjcsNjkgQEAKICAgICAgICAgaWYgeW91IHdvdWxkIHByZWZlciB0byBkbyB0aGF0LiAgV2Ug
 c3Ryb25nbHkgcmVjb21tZW5kIHlvdQogICAgICAgICB1c2UgJm1hbi5tZXJnZW1hc3Rlci44Oywg
 aG93ZXZlciwgYW5kIGlmIHlvdSBkbyB0aGVuIHlvdQogICAgICAgICBjYW4gc2tpcCBmb3J3YXJk
 IHRvIHRoZSA8bGluayBsaW5rZW5kPSJ1cGRhdGUtZGV2Ij5uZXh0Ci0gICAgICAgIHNlY3Rpb248
 L2xpbms+LCBzaW5jZSAmbWFuLm1lcmdlbWFzdGVyLjg7IGlzIHZlcnkgc2ltcGxlIHRvIHVzZS4K
 LSAgICAgICAgWW91IHNob3VsZCByZWFkIHRoZSBtYW51YWwgcGFnZSBmaXJzdCwgYW5kIG1ha2Ug
 YSBiYWNrdXAgb2YKKyAgICAgICAgc2VjdGlvbjwvbGluaz4sIHNpbmNlICZtYW4ubWVyZ2VtYXN0
 ZXIuODsgaXMgZGVzY3JpYmVkIGJlbG93LgorICAgICAgICBCZSBzdXJlIHRvIG1ha2UgYSBiYWNr
 dXAgb2YKICAgICAgICAgPGZpbGVuYW1lPi9ldGM8L2ZpbGVuYW1lPiBpbiBjYXNlIGFueXRoaW5n
 IGdvZXMgd3JvbmcuPC9wYXJhPgogCi0gICAgICA8cGFyYT5JZiB5b3Ugd2lzaCB0byBkbyB0aGUg
 dXBkYXRlIG1hbnVhbGx5LAorICAgICAgPHBhcmE+VGhlICZtYW4ubWVyZ2VtYXN0ZXIuODsgdXRp
 bGl0eSBpcyBhIEJvdXJuZSBzY3JpcHQgdGhhdCB3aWxsCisgICAgICAgIGFpZCB5b3UgaW4gZGV0
 ZXJtaW5pbmcgdGhlIGRpZmZlcmVuY2VzIGJldHdlZW4geW91ciBjb25maWd1cmF0aW9uIGZpbGVz
 CisgICAgICAgIGluIDxmaWxlbmFtZT4vZXRjPC9maWxlbmFtZT4sIGFuZCB0aGUgY29uZmlndXJh
 dGlvbiBmaWxlcyBpbgorICAgICAgICB0aGUgc291cmNlIHRyZWUgPGZpbGVuYW1lPi91c3Ivc3Jj
 L2V0YzwvZmlsZW5hbWU+LiBUaGlzIGlzCisgICAgICAgIHRoZSByZWNvbW1lbmRlZCBzb2x1dGlv
 biBmb3Iga2VlcGluZyB0aGUgc3lzdGVtIGNvbmZpZ3VyYXRpb24gZmlsZXMgdXAgdG8gZGF0ZQor
 ICAgICAgICB3aXRoIG9uZXMgbG9jYXRlZCBpbiB0aGUgc291cmNlIHRyZWUuPC9wYXJhPgorCisg
 ICAgICA8cGFyYT48Y29tbWFuZD5tZXJnZW1hc3RlcjwvY29tbWFuZD4gd2FzIGludGVncmF0ZWQg
 aW50byB0aGUgRnJlZUJTRCBiYXNlCisgICAgICAgIHN5c3RlbSBiZXR3ZWVuIDMuMy1SRUxFQVNF
 IGFuZCAzLjQtUkVMRUFTRSwgd2hpY2ggbWVhbnMgaXQgaXMKKyAgICAgICAgcHJlc2VudCBpbiBh
 bGwgLVNUQUJMRSBhbmQgLUNVUlJFTlQgc3lzdGVtcyBzaW5jZSAzLjMuPC9wYXJhPgorCisgICAg
 ICA8cGFyYT5UbyBiZWdpbiBzaW1wbHkgdHlwZSA8Y29tbWFuZD5tZXJnZW1hc3RlcjwvY29tbWFu
 ZD4gYXQgeW91ciBwcm9tcHQsIGFuZAorICAgICAgICB3YXRjaCBpdCBzdGFydCBnb2luZy4gIDxj
 b21tYW5kPm1lcmdlbWFzdGVyPC9jb21tYW5kPiB3aWxsIHRoZW4gYnVpbGQgYQorICAgICAgICB0
 ZW1wb3Jhcnkgcm9vdCBlbnZpcm9ubWVudCwgZnJvbSA8ZmlsZW5hbWU+LzwvZmlsZW5hbWU+IGRv
 d24sIGFuZCB0aGVuIHBvcHVsYXRlCisgICAgICAgIGl0IHdpdGggdmFyaW91cyBzeXN0ZW0gY29u
 ZmlndXJhdGlvbiBmaWxlcy4gIFRob3NlIGZpbGVzIGFyZSB0aGVuIGNvbXBhcmVkCisgICAgICAg
 IHRvIHRoZSBvbmVzIGN1cnJlbnRseSBpbnN0YWxsZWQgaW4geW91ciBzeXN0ZW0uICBBdCB0aGlz
 IHBvaW50LCBmaWxlcyB0aGF0CisgICAgICAgIGRpZmZlciB3aWxsIGJlIHNob3duIGluICZtYW4u
 ZGlmZi4xOyBmb3JtYXQsIHdpdGggdGhlIDxvcHRpb24+Kzwvb3B0aW9uPiBzaWduCisgICAgICAg
 IHJlcHJlc2VudGluZyBhZGRlZCBvciBtb2RpZmllZCBsaW5lcywgYW5kIDxvcHRpb24+LTwvb3B0
 aW9uPiByZXByZXNlbnRpbmcKKyAgICAgICAgbGluZXMgdGhhdCB3aWxsIGJlIHJlbW92ZWQgZWl0
 aGVyIGNvbXBsZXRlbHksIG9yIHJlcGxhY2VkIHdpdGggYSBuZXcgbGluZS4KKyAgICAgICAgU2Vl
 IHRoZSAmbWFuLmRpZmYuMTsgbWFudWFsIHBhZ2UgZm9yIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQg
 dGhlICZtYW4uZGlmZi4xOworICAgICAgICBzeW50YXggYW5kIGhvdyBmaWxlIGRpZmZlcmVuY2Vz
 IGFyZSBzaG93bi48L3BhcmE+CisKKyAgICAgIDxwYXJhPiZtYW4ubWVyZ2VtYXN0ZXIuODsgd2ls
 bCB0aGVuIHNob3cgeW91IGVhY2ggZmlsZSB0aGF0IGRpc3BsYXlzIHZhcmlhbmNlcywKKyAgICAg
 ICAgYW5kIGF0IHRoaXMgcG9pbnQgeW91IHdpbGwgaGF2ZSB0aGUgb3B0aW9uIG9mIGVpdGhlciBk
 ZWxldGluZyB0aGUgbmV3IGZpbGUgKHJlZmVycmVkCisgICAgICAgIHRvIGFzIHRoZSB0ZW1wb3Jh
 cnkgZmlsZSksIGluc3RhbGwgdGhlIHRlbXBvcmFyeSBmaWxlIGluIGl0cyB1bm1vZGlmaWVkIHN0
 YXRlLAorICAgICAgICBtZXJnZSB0aGUgdGVtcG9yYXJ5IGZpbGUgd2l0aCB0aGUgY3VycmVudGx5
 IGluc3RhbGxlZCBmaWxlLCBvciB2aWV3IHRoZQorICAgICAgICAmbWFuLmRpZmYuMTsgcmVzdWx0
 cyBhZ2Fpbi48L3BhcmE+CisKKyAgICAgIDxwYXJhPkNob29zaW5nIHRvIGRlbGV0ZSB0aGUgdGVt
 cG9yYXJ5IHdpbGwgdGVsbCAmbWFuLm1lcmdlbWFzdGVyLjg7IHRoYXQgd2UKKyAgICAgICAgd2lz
 aCB0byBrZWVwIG91ciBjdXJyZW50IGZpbGUgdW5jaGFuZ2VkLCBhbmQgdG8gZGVsZXRlIHRoZSBv
 bmUgdGhhdCBpcworICAgICAgICBuZXcuICBUaGlzIG9wdGlvbiBpcyBub3QgdGhlIG1vc3QgcmVj
 b21tZW5kZWQgb25lLCB1bmxlc3MgeW91IHNlZSBubworICAgICAgICByZWFzb24gdG8gY2hhbmdl
 IHRoZSBjdXJyZW50IGZpbGUuICBZb3UgY2FuIGdldCBoZWxwIGF0IGFueSB0aW1lIGJ5CisgICAg
 ICAgIHR5cGluZyA8b3B0aW9uPj88L29wdGlvbj4gYXQgdGhlIG1lcmdlbWFzdGVyIHByb21wdC4g
 IElmIHRoZSB1c2VyIHNob3VsZAorICAgICAgICBjaG9vc2UgdG8gc2tpcCBhIGZpbGUsIGl0IHdp
 bGwgYmUgcHJlc2VudGVkIGFnYWluIGFmdGVyIGFsbCBvdGhlciBmaWxlcworICAgICAgICBoYXZl
 IGJlZW4gd29ya2VkIHdpdGguPC9wYXJhPgorCisgICAgICA8cGFyYT5DaG9vc2luZyB0byBpbnN0
 YWxsIHRoZSB1bm1vZGlmaWVkIHRlbXBvcmFyeSBmaWxlIHdpbGwgcmVwbGFjZSB0aGUKKyAgICAg
 ICAgY3VycmVudCBmaWxlIHdpdGggdGhlIG5ldyBvbmUuICBGb3IgbW9zdCB1bm1vZGlmaWVkIGZp
 bGVzLCB0aGlzIGlzIHRoZSBiZXN0CisgICAgICAgIG9wdGlvbi48L3BhcmE+CisKKyAgICAgIDxw
 YXJhPkNob29zaW5nIHRvIG1lcmdlIHRoZSBmaWxlIHdpbGwgcHJlc2VudCB5b3Ugd2l0aCBhIHRl
 eHQgZWRpdG9yLAorICAgICAgICBhbmQgdGhlIGNvbnRlbnRzIG9mIGJvdGggZmlsZXMuICBZb3Ug
 Y2FuIG5vdyBtZXJnZSB0aGVtIGJ5CisgICAgICAgIHJldmlld2luZyBib3RoIGZpbGVzIHNpZGUg
 Ynkgc2lkZSBvbiB0aGUgc2NyZWVuLCBhbmQgY2hvb3NpbmcgcGFydHMgZnJvbQorICAgICAgICBi
 b3RoIHRvIGNyZWF0ZSBhIGZpbmlzaGVkIHByb2R1Y3QuICBXaGVuIHRoZSBmaWxlcyBhcmUgY29t
 cGFyZWQgc2lkZSBieSBzaWRlLAorICAgICAgICB0aGUgPG9wdGlvbj5sPC9vcHRpb24+IGtleSB3
 aWxsIHNlbGVjdCB0aGUgbGVmdCBjb250ZW50cyBhbmQgdGhlCisgICAgICAgIDxvcHRpb24+cjwv
 b3B0aW9uPiBrZXkgd2lsbCBzZWxlY3QgY29udGVudHMgZnJvbSB5b3VyIHJpZ2h0LgorICAgICAg
 ICBUaGUgZmluYWwgb3V0cHV0IHdpbGwgYmUgYSBmaWxlIGNvbnNpc3Rpbmcgb2YgYm90aCBwYXJ0
 cywgd2hpY2ggY2FuIHRoZW4gYmUKKyAgICAgICAgaW5zdGFsbGVkLiAgVGhpcyBpcyB1c3VhbCBv
 cHRpb24gZm9yIGZpbGVzIHdoZXJlIHNldHRpbmdzIGhhdmUgYmVlbgorICAgICAgICBtb2RpZmll
 ZCBieSB0aGUgdXNlci48L3BhcmE+CisKKyAgICAgIDxwYXJhPkNob29zaW5nIHRvIHZpZXcgdGhl
 IGRpZmYgcmVzdWx0cyBhZ2Fpbiwgd2lsbCBzaG93IHlvdSB0aGUgZmlsZSBkaWZmZXJlbmNlcwor
 ICAgICAgICBqdXN0IGxpa2UgJm1hbi5tZXJnZW1hc3Rlci44OyBkaWQgYmVmb3JlIHByb21wdGlu
 ZyB5b3UgZm9yIGFuIG9wdGlvbi48L3BhcmE+CisKKyAgICAgIDxwYXJhPkFmdGVyICZtZXJnZW1h
 c3Rlci44OyBpcyBjb21wbGV0ZSB3aXRoIHRoZSBzeXN0ZW0gZmlsZXMgeW91IHdpbGwgYmUgcHJv
 bXB0ZWQKKyAgICAgICAgZm9yIG90aGVyIG9wdGlvbnMuICAmbWFuLm1lcmdlbWFzdGVyLjg7IHdp
 bGwgYXNrIGlmIHlvdSB3YW50IHRvIHJlYnVpbGQgdGhlCisgICAgICAgIHBhc3N3b3JkIGZpbGUs
 IHJ1biA8ZmlsZW5hbWU+TUFLRURFVjwvZmlsZW5hbWU+IGFuZCBmaW5pc2hpbmcgdXAgd2l0aCBh
 CisgICAgICAgIHJlbW92YWwgb2YgdGhlIGxlZnQgb3ZlciB0ZW1wb3JhcnkgZmlsZXMuPC9wYXJh
 PgorCisgICAgICA8cGFyYT5JZiB5b3Ugd2lzaCB0byBkbyB0aGUgdXBkYXRlIG1hbnVhbGx5LCBo
 b3dldmVyLAogICAgICAgICB5b3UgY2Fubm90IGp1c3QgY29weSBvdmVyIHRoZSBmaWxlcyBmcm9t
 CiAJPGZpbGVuYW1lPi91c3Ivc3JjL2V0YzwvZmlsZW5hbWU+IHRvIDxmaWxlbmFtZT4vZXRjPC9m
 aWxlbmFtZT4gYW5kCiAJaGF2ZSBpdCB3b3JrLiAgU29tZSBvZiB0aGVzZSBmaWxlcyBtdXN0IGJl
 IDxxdW90ZT5pbnN0YWxsZWQ8L3F1b3RlPgo=
 
 --Multipart_Thu__28_Mar_2002_18:04:12_-0500_081a6a00--
 
 --=.Ei'hU9sxSPz0g)
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.0.6 (FreeBSD)
 
 iD8DBQE8o6FwwPmgiRuevUMRAhzTAKD0m+v2LYcEiALr4vrLRhoeZs6Z6QCdF4ig
 WeMA7PBFaNNUHj34eD4nuEA=
 =7HJC
 -----END PGP SIGNATURE-----
 
 --=.Ei'hU9sxSPz0g)--
 

From: Tom Rhodes <darklogik@pittgoth.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/36263: [PATCH for review] mergemaster section
Date: Thu, 28 Mar 2002 18:18:10 -0500

 --=.XPzmgFI2o,9RV1
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 On Thu, 28 Mar 2002 15:00:05 -0800 (PST)
 Tom Rhodes <darklogik@pittgoth.com> wrote:
 
 > The following reply was made to PR docs/36263; it has been noted by
 > GNATS.
 
 GRRR I didn't want it to MIME encode...
 
 
 -- 
 Tom (Darklogik) Rhodes
 www.FreeBSD.org  -The Power To Serve
 www.Pittgoth.com -Pittgoth Discussion Portal
 trhodes@ {Pittgoth.com, FreeBSD.org}
 
 --=.XPzmgFI2o,9RV1
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.0.6 (FreeBSD)
 
 iD8DBQE8o6S4wPmgiRuevUMRAgl1AKDVtv4LH5TW2S47JoibX9560qOpfgCfaQ64
 BidmeU/UVdRo59s9cXlmXl8=
 =nJ/G
 -----END PGP SIGNATURE-----
 
 --=.XPzmgFI2o,9RV1--
 

From: Tom Rhodes <darklogik@pittgoth.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/36263: [PATCH] mergemaster
Date: Thu, 28 Mar 2002 18:31:01 -0500 (EST)

 diff -ruN handbook/cutting-edge/chapter.sgml handbook.new/cutting-edge/chapter.sgml
 --- handbook/cutting-edge/chapter.sgml	Tue Mar 26 20:16:48 2002
 +++ handbook.new/cutting-edge/chapter.sgml	Thu Mar 28 17:55:43 2002
 @@ -1067,11 +1067,69 @@
          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 <link linkend="update-dev">next
 -        section</link>, since &man.mergemaster.8; is very simple to use.
 -        You should read the manual page first, and make a backup of
 +        section</link>, since &man.mergemaster.8; is described below.
 +        Be sure to make a backup of
          <filename>/etc</filename> in case anything goes wrong.</para>
  
 -      <para>If you wish to do the update manually,
 +      <para>The &man.mergemaster.8; utility is a Bourne script that will
 +        aid you in determining the differences between your configuration files
 +        in <filename>/etc</filename>, and the configuration files in
 +        the source tree <filename>/usr/src/etc</filename>. This is
 +        the recommended solution for keeping the system configuration files up to date
 +        with ones located in the source tree.</para>
 +
 +      <para><command>mergemaster</command> was integrated into the FreeBSD base
 +        system between 3.3-RELEASE and 3.4-RELEASE, which means it is
 +        present in all -STABLE and -CURRENT systems since 3.3.</para>
 +
 +      <para>To begin simply type <command>mergemaster</command> at your prompt, and
 +        watch it start going.  <command>mergemaster</command> will then build a
 +        temporary root environment, from <filename>/</filename> down, and then populate
 +        it with various system configuration files.  Those files are then compared
 +        to the ones currently installed in your system.  At this point, files that
 +        differ will be shown in &man.diff.1; format, with the <option>+</option> sign
 +        representing added or modified lines, and <option>-</option> representing
 +        lines that will be removed either completely, or replaced with a new line.
 +        See the &man.diff.1; manual page for more information about the &man.diff.1;
 +        syntax and how file differences are shown.</para>
 +
 +      <para>&man.mergemaster.8; will then show you each file that displays variances,
 +        and at this point you will have the option of either deleting the new file (referred
 +        to as the temporary file), install the temporary file in its unmodified state,
 +        merge the temporary file with the currently installed file, or view the
 +        &man.diff.1; results again.</para>
 +
 +      <para>Choosing to delete the temporary will tell &man.mergemaster.8; that we
 +        wish to keep our current file unchanged, and to delete the one that is
 +        new.  This option is not the most recommended one, unless you see no
 +        reason to change the current file.  You can get help at any time by
 +        typing <option>?</option> at the mergemaster prompt.  If the user should
 +        choose to skip a file, it will be presented again after all other files
 +        have been worked with.</para>
 +
 +      <para>Choosing to install the unmodified temporary file will replace the
 +        current file with the new one.  For most unmodified files, this is the best
 +        option.</para>
 +
 +      <para>Choosing to merge the file will present you with a text editor,
 +        and the contents of both files.  You can now merge them by
 +        reviewing both files side by side on the screen, and choosing parts from
 +        both to create a finished product.  When the files are compared side by side,
 +        the <option>l</option> key will select the left contents and the
 +        <option>r</option> key will select contents from your right.
 +        The final output will be a file consisting of both parts, which can then be
 +        installed.  This is usual option for files where settings have been
 +        modified by the user.</para>
 +
 +      <para>Choosing to view the diff results again, will show you the file differences
 +        just like &man.mergemaster.8; did before prompting you for an option.</para>
 +
 +      <para>After &mergemaster.8; is complete with the system files you will be prompted
 +        for other options.  &man.mergemaster.8; will ask if you want to rebuild the
 +        password file, run <filename>MAKEDEV</filename> and finishing up with a
 +        removal of the left over temporary files.</para>
 +
 +      <para>If you wish to do the update manually, however,
          you cannot just copy over the files from
  	<filename>/usr/src/etc</filename> to <filename>/etc</filename> and
  	have it work.  Some of these files must be <quote>installed</quote>
State-Changed-From-To: open->closed 
State-Changed-By: trhodes 
State-Changed-When: Thu Mar 28 18:36:59 PST 2002 
State-Changed-Why:  
I have just committed a patch which adds a mergemaster section to the 
handbook, thanks for pointing this out! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36263 
>Unformatted:
