summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-08-11 06:30:40 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-08-11 06:30:40 +0000
commitd1a1dc0a3e164e382b0788a09b5d685507fa653c (patch)
treea6cf6287c9037f21c09aa28dc8c9997d132c50f2 /usr.sbin/sysmerge/sysmerge.8
parent8dbff3131c06ccf8efb81f8fb94ad3c35778a197 (diff)
Move a sentence to the corresponding option description.
from jmc@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.815
1 files changed, 6 insertions, 9 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index e1088180dde..ce10b07d524 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.55 2014/08/10 17:15:18 jmc Exp $
+.\" $OpenBSD: sysmerge.8,v 1.56 2014/08/11 06:30:39 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 10 2014 $
+.Dd $Mdocdate: August 11 2014 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -139,6 +139,10 @@ Package mode.
compares the default configuration files of installed
.Xr packages 7
against their target on the system (@sample).
+This option is mutually exclusive with
+.Fl s
+and
+.Fl x .
.It Fl S
Do not verify signatures for tgz sets.
This option has no effect when sets aren't used.
@@ -157,13 +161,6 @@ to
.Xr ftp 1 .
.El
.Pp
-The
-.Fl p
-option is mutually exclusive with
-.Fl s
-and
-.Fl x .
-.Pp
Files and directories can be excluded from comparison
by listing them in the file
.Pa /etc/sysmerge.ignore ,