summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-09-07 10:02:05 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-09-07 10:02:05 +0000
commit6b7d0662f1058d688df3a26190f457490da37541 (patch)
tree810ebd38e24010379f258547f30f6aa77acd0175 /usr.sbin/sysmerge/sysmerge.8
parent324a09ffda5af4380a9cefec4ce2415545b928fa (diff)
Simplify handling of sum files.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.813
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index d74fbae2bb3..646511e248a 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.71 2015/08/24 11:03:41 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.72 2015/09/07 10:02:04 ajacoutot Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: August 24 2015 $
+.Dd $Mdocdate: September 7 2015 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -109,7 +109,9 @@ against their target on the system (@sample).
.Pp
Files can be excluded from comparison by listing them in
.Pa /etc/sysmerge.ignore .
-The following files will always be skipped from direct comparison:
+Checksum files stored under
+.Pa /var/sysmerge
+as well as the following files will always be skipped from direct comparison:
.Pa /etc/group ,
.Pa /etc/localtime ,
.Pa /etc/mail/aliases.db ,
@@ -119,10 +121,7 @@ The following files will always be skipped from direct comparison:
.Pa /etc/pwd.db ,
.Pa /etc/spwd.db ,
.Pa /var/db/locate.database ,
-.Pa /var/mail/root ,
-.Pa /var/sysmerge/etcsum ,
-.Pa /var/sysmerge/examplessum ,
-.Pa /var/sysmerge/xetcsum .
+.Pa /var/mail/root .
.Sh ENVIRONMENT
.Bl -tag -width "EDITORXXVISUAL"
.It Ev EDITOR , VISUAL