summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2014-08-09 16:39:25 +0000
committerjmc <jmc@openbsd.org>2014-08-09 16:39:25 +0000
commit75f0286e5e82742d2133404ee9ea8b2c9f20ef54 (patch)
treea186e86c7bc3b82497b3ab9021171d7051683656 /usr.sbin/sysmerge/sysmerge.8
parentmmap(2) requires MAP_PRIVATE ^ MAP_SHARED for flags; (diff)
downloadwireguard-openbsd-75f0286e5e82742d2133404ee9ea8b2c9f20ef54.tar.xz
wireguard-openbsd-75f0286e5e82742d2133404ee9ea8b2c9f20ef54.zip
less chatty; ok ajacoutot
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-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.