Date: Sat, 6 Sep 2008 21:41:01 -0500 (CDT) From: Jeffrey Goldberg <jeffrey@goldmark.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: docs/127167: add AUTO_UPGRADE to mergemaster(8) man page Message-ID: <20080907024101.C34732E002A@n118.ewd.goldmark.org> Resent-Message-ID: <200809070300.m8730BBO021749@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127167 >Category: docs >Synopsis: add AUTO_UPGRADE to mergemaster(8) man page >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 07 03:00:10 UTC 2008 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080907024101.C34732E002A>