Bug 37925 - [PATCH] cutting-edge: clarify mergemaster discussion
Summary: [PATCH] cutting-edge: clarify mergemaster discussion
Status: Closed FIXED
Alias: None
Product: Documentation
Classification: Unclassified
Component: Books & Articles (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-doc (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-05-10 15:40 UTC by Martin Heinen
Modified: 2002-05-10 17:13 UTC (History)
0 users

See Also:


Attachments
file.diff (2.66 KB, patch)
2002-05-10 15:40 UTC, Martin Heinen
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Heinen 2002-05-10 15:40:01 UTC
	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 <sect3> 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'.
Comment 1 Tom Rhodes freebsd_committer freebsd_triage 2002-05-10 17:12:30 UTC
State Changed
From-To: open->closed

Committed!  And I was reviewing this just yesterday, thanks alot 
Martin!