View | Details | Raw Unified | Return to bug 127167
Collapse All | Expand All

(-)mergemaster.8 (-1 / +4 lines)
Lines 24-30 Link Here
24 
.\"
 24 
.\"
25 
.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.36 2006/04/30 22:09:47 gordon Exp $
 25 
.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.36 2006/04/30 22:09:47 gordon Exp $
26 
.\"
 26 
.\"
27 
.Dd February 4, 2006
 27 
.Dd September 6, 2008
28 
.Dt MERGEMASTER 8
 28 
.Dt MERGEMASTER 8
29 
.Os
 29 
.Os
30 
.Sh NAME
 30 
.Sh NAME
Lines 312-317 Link Here
312 
# Automatically install files that do not exist on the system already
 312 
# Automatically install files that do not exist on the system already
313 
#AUTO_INSTALL=
 313 
#AUTO_INSTALL=
314 
#
 314 
#
315 
# Attempt to auto upgrade files that have not been user modified.
316 
#AUTO_UPGRADE=
317 
#
315 
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf
 318 
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf
316 
#COMP_CONFS=yes
 319 
#COMP_CONFS=yes
317 
#
 320 
#

Return to bug 127167