summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-08-09 16:39:26 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-08-09 16:39:26 +0000
commitefae50b4e3590a36917f4304fb8a2eccbda0d314 (patch)
treea03c01f7a4795eb5e17c509e31d962359c4ea290 /usr.sbin/sysmerge
parent2298c31a148eba309cc9c80863af500b93eaa8c4 (diff)
less chatty; ok ajacoutot
Diffstat (limited to 'usr.sbin/sysmerge')
-rw-r--r--usr.sbin/sysmerge/sysmerge.812
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 68a246b0160..7014d60e745 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.53 2014/08/09 12:45:03 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.54 2014/08/09 16:39:25 jmc Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
.\"
@@ -132,15 +132,13 @@ runs non-interactively,
saving differing files for later manual processing.
.It Fl d
Diff mode.
-In this mode,
.Nm
-will not take any automatic action, allowing for a full diff comparison.
+does not take any automatic action, allowing for a full diff comparison.
.It Fl p
-.Xr packages 7
-mode.
-In this mode,
+Package mode.
.Nm
-will compare the default configuration files of installed packages
+compares the default configuration files of installed
+.Xr packages 7
against their target on the system (@sample).
.It Fl S
Do not verify signatures for tgz sets.