diff options
| author |   jmc <jmc@openbsd.org> | 2014-08-10 17:15:18 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2014-08-10 17:15:18 +0000 |
| commit | 4acd396c8847eda5f2ecb08bd4453c35a674e2d9 (patch) | |
| tree | 9e97acea8685cc8de6c7342dc441dbc1a2975d87 | |
| parent | guenther wants a copyright (diff) | |
| download | wireguard-openbsd-4acd396c8847eda5f2ecb08bd4453c35a674e2d9.tar.xz wireguard-openbsd-4acd396c8847eda5f2ecb08bd4453c35a674e2d9.zip | |
- add -p to SYNOPSIS
- the argument to -s is not optional
ok ajacoutot
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 9 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 7014d60e745..e1088180dde 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.54 2014/08/09 16:39:25 jmc Exp $ +.\" $OpenBSD: sysmerge.8,v 1.55 2014/08/10 17:15:18 jmc 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 9 2014 $ +.Dd $Mdocdate: August 10 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -24,8 +24,7 @@ .Nm .Bk -words .Op Fl bdS -.Op Fl s Op Ar src \*(Ba etcXX.tgz -.Op Fl x Ar xetcXX.tgz +.Op Fl p | Oo Fl s Ar src \*(Ba etcXX.tgz Oc Op Fl x Ar xetcXX.tgz .Ek .Sh DESCRIPTION .Nm @@ -143,7 +142,7 @@ against their target on the system (@sample). .It Fl S Do not verify signatures for tgz sets. This option has no effect when sets aren't used. -.It Fl s Op Ar src \*(Ba etcXX.tgz +.It Fl s Ar src \*(Ba etcXX.tgz Specify a path to an .Ox top src directory or an etcXX.tgz tarball. diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index a9deecc2b20..ddf1949b6e2 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.148 2014/08/09 12:46:51 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.149 2014/08/10 17:15:18 jmc Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -64,7 +64,7 @@ restore_sum() { } usage() { - echo "usage: ${0##*/} [-bdS] [-p | [-s [src | etcXX.tgz]] [-x xetcXX.tgz]]" >&2 + echo "usage: ${0##*/} [-bdS] [-p | [-s src | etcXX.tgz] [-x xetcXX.tgz]]" >&2 } warn() { |