From owner-freebsd-doc@FreeBSD.ORG Sun Sep 7 03:00:11 2008 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9E5B106567C for ; Sun, 7 Sep 2008 03:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9C37A8FC1A for ; Sun, 7 Sep 2008 03:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8730Bu4021750 for ; Sun, 7 Sep 2008 03:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8730BBO021749; Sun, 7 Sep 2008 03:00:11 GMT (envelope-from gnats) Resent-Date: Sun, 7 Sep 2008 03:00:11 GMT Resent-Message-Id: <200809070300.m8730BBO021749@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeffrey Goldberg Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09E5F1065673 for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: docs/127167: add AUTO_UPGRADE to mergemaster(8) man page X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeffrey Goldberg List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2008 03:00:11 -0000 >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: