From jeffrey@goldmark.org  Sun Sep  7 02:58:06 2008
Return-Path: <jeffrey@goldmark.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09E5F1065673
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Sep 2008 02:58:06 +0000 (UTC)
	(envelope-from jeffrey@goldmark.org)
Received: from n118.ewd.goldmark.org (n118.ewd.goldmark.org [72.64.118.118])
	by mx1.freebsd.org (Postfix) with ESMTP id E19BC8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Sep 2008 02:58:05 +0000 (UTC)
	(envelope-from jeffrey@goldmark.org)
Received: by n118.ewd.goldmark.org (Postfix, from userid 1001)
	id C34732E002A; Sat,  6 Sep 2008 21:41:01 -0500 (CDT)
Message-Id: <20080907024101.C34732E002A@n118.ewd.goldmark.org>
Date: Sat,  6 Sep 2008 21:41:01 -0500 (CDT)
From: Jeffrey Goldberg <jeffrey@goldmark.org>
Reply-To: Jeffrey Goldberg <jeffrey@goldmark.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: add AUTO_UPGRADE to mergemaster(8) man page
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         127167
>Category:       docs
>Synopsis:       [patch] add AUTO_UPGRADE to mergemaster(8) man page
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 07 03:00:10 UTC 2008
>Closed-Date:    Fri Jan 09 11:27:50 UTC 2009
>Last-Modified:  Fri Jan 09 11:27:50 UTC 2009
>Originator:     Jeffrey Goldberg
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD dobby.ewd.goldmark.org 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #20: Thu Sep 4 17:09:34 CDT 2008 root@dobby.ewd.goldmark.org:/usr/obj/usr/src/sys/DOBBY i386

>Description:
	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.
>How-To-Repeat:
	man mergemaster
>Fix:
	See patch (diff -u) below.


--- mergemaster.8.orig	2008-09-06 21:27:46.000000000 -0500
+++ mergemaster.8	2008-09-06 21:32:00.000000000 -0500
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.36 2006/04/30 22:09:47 gordon Exp $
 .\"
-.Dd February 4, 2006
+.Dd September 6, 2008
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -312,6 +312,9 @@
 # Automatically install files that do not exist on the system already
 #AUTO_INSTALL=
 #
+# Attempt to auto upgrade files that have not been user modified.
+#AUTO_UPGRADE=
+#
 # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf
 #COMP_CONFS=yes
 #


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->dougb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Sep 7 03:07:51 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127167 
State-Changed-From-To: open->patched 
State-Changed-By: dougb 
State-Changed-When: Thu Jan 1 09:20:26 UTC 2009 
State-Changed-Why:  

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 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127167 
State-Changed-From-To: patched->closed 
State-Changed-By: dougb 
State-Changed-When: Fri Jan 9 11:27:33 UTC 2009 
State-Changed-Why:  

This change is now MFC'ed through RELENG_6 

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