Bug 127167

Summary: [patch] add AUTO_UPGRADE to mergemaster(8) man page
Product: Documentation Reporter: Jeffrey Goldberg <jeffrey>
Component: Books & ArticlesAssignee: Doug Barton <dougb>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Jeffrey Goldberg 2008-09-07 04:00:10 UTC
	man page for mergemaster(8) does not mention the AUTO_UPGRADE directive
	that can appear in mergemaster.rc.  The attached patch to the
	mergemaster.8 fixes that.

Fix: See patch (diff -u) below.

How-To-Repeat: 	man mergemaster
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2008-09-07 04:07:51 UTC
Responsible Changed
From-To: freebsd-doc->dougb

Over to maintainer.
Comment 2 Doug Barton freebsd_committer freebsd_triage 2009-01-01 09:20:26 UTC
State Changed
From-To: open->patched


This was already committed to HEAD some time ago. I will merge it 
along with the other updates I'm working on after the 7.1 freeze. 

Thanks, 

Doug
Comment 3 Doug Barton freebsd_committer freebsd_triage 2009-01-09 11:27:33 UTC
State Changed
From-To: patched->closed


This change is now MFC'ed through RELENG_6