Bug 37925

Summary: [PATCH] cutting-edge: clarify mergemaster discussion
Product: Documentation Reporter: Martin Heinen <martin>
Component: Books & ArticlesAssignee: freebsd-doc (Nobody) <doc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

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!