<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.freebsd.org/bugzilla/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.freebsd.org/bugzilla/"
          
          maintainer="bugmeister@FreeBSD.org"
>

    <bug>
          <bug_id>37925</bug_id>
          
          <creation_ts>2002-05-10 15:40:01 +0000</creation_ts>
          <short_desc>[PATCH] cutting-edge: clarify mergemaster discussion</short_desc>
          <delta_ts>2002-05-10 17:13:03 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>Documentation</product>
          <component>Books &amp; Articles</component>
          <version>Latest</version>
          <rep_platform>Any</rep_platform>
          <op_sys>Any</op_sys>
          <bug_status>Closed</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>Normal</priority>
          <bug_severity>Affects Only Me</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Martin Heinen">martin</reporter>
          <assigned_to name="freebsd-doc (Nobody)">doc</assigned_to>
          
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>121181</commentid>
    <comment_count>0</comment_count>
    <who name="Martin Heinen">martin</who>
    <bug_when>2002-05-10 15:40:01 +0000</bug_when>
    <thetext>	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 &lt;sect3&gt; 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 &apos;Update Files Not Updated by make world&apos; in the
	chapter &apos;The Cutting Edge&apos;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>121182</commentid>
    <comment_count>1</comment_count>
    <who name="Tom Rhodes">trhodes</who>
    <bug_when>2002-05-10 17:12:30 +0000</bug_when>
    <thetext>State Changed
From-To: open-&gt;closed

Committed!  And I was reviewing this just yesterday, thanks alot 
Martin!</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>21695</attachid>
            <date>2002-05-10 15:40:01 +0000</date>
            <delta_ts>2002-05-10 15:40:01 +0000</delta_ts>
            <desc>file.diff</desc>
            <filename>file.diff</filename>
            <type>text/plain</type>
            <size>2727</size>
            <attacher name="Martin Heinen">martin</attacher>
            
              <data encoding="base64">SW5kZXg6IGNoYXB0ZXIuc2dtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvdS9jdnMvZG9jL2VuX1VT
LklTTzg4NTktMS9ib29rcy9oYW5kYm9vay9jdXR0aW5nLWVkZ2UvY2hhcHRlci5zZ21sLHYKcmV0
cmlldmluZyByZXZpc2lvbiAxLjEyMApkaWZmIC11IC1yMS4xMjAgY2hhcHRlci5zZ21sCi0tLSBj
aGFwdGVyLnNnbWwJNCBNYXkgMjAwMiAxNDoyMjozNCAtMDAwMAkxLjEyMAorKysgY2hhcHRlci5z
Z21sCTEwIE1heSAyMDAyIDEzOjU5OjQxIC0wMDAwCkBAIC0xMDYwLDE2ICsxMDYwLDE2IEBACiAg
ICAgICA8cGFyYT5SZW1ha2luZyB0aGUgd29ybGQgd2lsbCBub3QgdXBkYXRlIGNlcnRhaW4gZGly
ZWN0b3JpZXMgKGluCiAJcGFydGljdWxhciwgPGZpbGVuYW1lPi9ldGM8L2ZpbGVuYW1lPiwgPGZp
bGVuYW1lPi92YXI8L2ZpbGVuYW1lPiBhbmQKIAk8ZmlsZW5hbWU+L3VzcjwvZmlsZW5hbWU+KSB3
aXRoIG5ldyBvciBjaGFuZ2VkIGNvbmZpZ3VyYXRpb24gZmlsZXMuPC9wYXJhPgotICAgICAgPGlu
ZGV4dGVybT48cHJpbWFyeT48Y29tbWFuZD5tZXJnZW1hc3RlcjwvY29tbWFuZD48L3ByaW1hcnk+
PC9pbmRleHRlcm0+CiAKICAgICAgIDxwYXJhPlRoZSBzaW1wbGVzdCB3YXkgdG8gdXBkYXRlIHRo
ZXNlIGZpbGVzIGlzIHRvIHVzZQogICAgICAgICAmbWFuLm1lcmdlbWFzdGVyLjg7LCB0aG91Z2gg
aXQgaXMgcG9zc2libGUgdG8gZG8gaXQgbWFudWFsbHkKLSAgICAgICAgaWYgeW91IHdvdWxkIHBy
ZWZlciB0byBkbyB0aGF0LiAgV2Ugc3Ryb25nbHkgcmVjb21tZW5kIHlvdQotICAgICAgICB1c2Ug
Jm1hbi5tZXJnZW1hc3Rlci44OywgaG93ZXZlciwgYW5kIGlmIHlvdSBkbyB0aGVuIHlvdQotICAg
ICAgICBjYW4gc2tpcCBmb3J3YXJkIHRvIHRoZSA8bGluayBsaW5rZW5kPSJ1cGRhdGUtZGV2Ij5u
ZXh0Ci0gICAgICAgIHNlY3Rpb248L2xpbms+LCBzaW5jZSAmbWFuLm1lcmdlbWFzdGVyLjg7IGlz
IGRlc2NyaWJlZCBiZWxvdy4KLSAgICAgICAgQmUgc3VyZSB0byBtYWtlIGEgYmFja3VwIG9mCi0g
ICAgICAgIDxmaWxlbmFtZT4vZXRjPC9maWxlbmFtZT4gaW4gY2FzZSBhbnl0aGluZyBnb2VzIHdy
b25nLjwvcGFyYT4KKyAgICAgICAgaWYgeW91IHdvdWxkIHByZWZlciB0byBkbyB0aGF0LiAgUmVn
YXJkbGVzcyBvZiB3aGljaCB3YXkgeW91CisJY2hvb3NlLCBiZSBzdXJlIHRvIG1ha2UgYSBiYWNr
dXAgb2YgPGZpbGVuYW1lPi9ldGM8L2ZpbGVuYW1lPiBpbgorCWNhc2UgYW55dGhpbmcgZ29lcyB3
cm9uZy48L3BhcmE+CisKKyAgICAgIDxzZWN0Mz4KKwk8dGl0bGU+PGNvbW1hbmQ+bWVyZ2VtYXN0
ZXI8L2NvbW1hbmQ+PC90aXRsZT4KKyAgICAgICAgPGluZGV4dGVybT48cHJpbWFyeT48Y29tbWFu
ZD5tZXJnZW1hc3RlcjwvY29tbWFuZD48L3ByaW1hcnk+PC9pbmRleHRlcm0+CiAKICAgICAgIDxw
YXJhPlRoZSAmbWFuLm1lcmdlbWFzdGVyLjg7IHV0aWxpdHkgaXMgYSBCb3VybmUgc2NyaXB0IHRo
YXQgd2lsbAogICAgICAgICBhaWQgeW91IGluIGRldGVybWluaW5nIHRoZSBkaWZmZXJlbmNlcyBi
ZXR3ZWVuIHlvdXIgY29uZmlndXJhdGlvbiBmaWxlcwpAQCAtMTEyOCw2ICsxMTI4LDEwIEBACiAg
ICAgICAgIHByb21wdGVkIGZvciBvdGhlciBvcHRpb25zLiAgJm1hbi5tZXJnZW1hc3Rlci44OyB3
aWxsIGFzayBpZiB5b3Ugd2FudCB0byByZWJ1aWxkCiAgICAgICAgIHRoZSBwYXNzd29yZCBmaWxl
LCBydW4gPGZpbGVuYW1lPk1BS0VERVY8L2ZpbGVuYW1lPiBhbmQgZmluaXNoaW5nIHVwIHdpdGgg
YQogICAgICAgICByZW1vdmFsIG9mIHRoZSBsZWZ0IG92ZXIgdGVtcG9yYXJ5IGZpbGVzLjwvcGFy
YT4KKyAgICAgIDwvc2VjdDM+CisKKyAgICAgIDxzZWN0Mz4KKwk8dGl0bGU+TWFudWFsIFVwZGF0
ZTwvdGl0bGU+CiAKICAgICAgIDxwYXJhPklmIHlvdSB3aXNoIHRvIGRvIHRoZSB1cGRhdGUgbWFu
dWFsbHksIGhvd2V2ZXIsCiAgICAgICAgIHlvdSBjYW5ub3QganVzdCBjb3B5IG92ZXIgdGhlIGZp
bGVzIGZyb20KQEAgLTExMzksNiArMTE0MywxMCBAQAogCXRoZXJlICBhcmUgZmlsZXMgdGhhdCBz
aG91bGQgYmUgaW4gPGZpbGVuYW1lPi9ldGM8L2ZpbGVuYW1lPiB0aGF0IGFyZQogCW5vdCBpbiA8
ZmlsZW5hbWU+L3Vzci9zcmMvZXRjPC9maWxlbmFtZT4uPC9wYXJhPgogCisgICAgICA8cGFyYT5J
ZiB5b3UgYXJlIHVzaW5nICZtYW4ubWVyZ2VtYXN0ZXIuODsgKGFzIHJlY29tbWVuZGVkKSwKKyAg
ICAgICAgeW91IGNhbiBza2lwIGZvcndhcmQgdG8gdGhlIDxsaW5rIGxpbmtlbmQ9InVwZGF0ZS1k
ZXYiPm5leHQKKwlzZWN0aW9uPC9saW5rPi48L3BhcmE+CisKICAgICAgIDxwYXJhPlRoZSBzaW1w
bGVzdCB3YXkgdG8gZG8gdGhpcyBieSBoYW5kIGlzIHRvIGluc3RhbGwgdGhlCiAJZmlsZXMgaW50
byBhIG5ldyBkaXJlY3RvcnksIGFuZCB0aGVuIHdvcmsgdGhyb3VnaCB0aGVtIGxvb2tpbmcKIAlm
b3IgZGlmZmVyZW5jZXMuPC9wYXJhPgpAQCAtMTI4MSw2ICsxMjg5LDcgQEAKIAkgIAogCTxzY3Jl
ZW4+JnByb21wdC5yb290OyA8dXNlcmlucHV0Pm1rZGlyIC92YXIvdG1wL3Jvb3QtYGRhdGUgIisl
WSVtJWQiYDwvdXNlcmlucHV0Pjwvc2NyZWVuPgogICAgICAgPC90aXA+CisgICAgICA8L3NlY3Qz
PgogICAgIDwvc2VjdDI+CiAgIAogICAgIDxzZWN0MiBpZD0idXBkYXRlLWRldiI+
</data>

          </attachment>
      

    </bug>

</bugzilla>