diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2010-11-11 10:46:11 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2010-11-11 10:46:11 +0000 |
| commit | 2352ec05368acabd5704882c559ec186a8b301f6 (patch) | |
| tree | 6d4cfeecfb6ec2ba1f7ddc0bfae31b1f48d1b906 /usr.sbin | |
| parent | f1846fcdaf71ebc48c1896e2e5afdd7b097b6e4b (diff) | |
Unconfuse usage.
prodded by and ok espie@, ok jmc@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 5bd1c645ef1..80dcdc3f6b5 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.32 2010/07/05 08:30:28 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.33 2010/11/11 10:46:10 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: July 5 2010 $ +.Dd $Mdocdate: November 11 2010 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -24,7 +24,7 @@ .Nm .Bk -words .Op Fl bd -.Op Fl s Ar src \*(Ba etcXX.tgz +.Op Fl s Op Ar src \*(Ba etcXX.tgz .Op Fl x Ar xetcXX.tgz .Ek .Sh DESCRIPTION diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 33d33eb0d53..3742fdd74a6 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.65 2010/11/08 14:05:09 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.66 2010/11/11 10:46:10 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -59,7 +59,7 @@ error_rm_wrkdir() { } usage() { - echo "usage: ${0##*/} [-bd] [-s src | etcXX.tgz] [-x xetcXX.tgz]" >&2 + echo "usage: ${0##*/} [-bd] [-s [src | etcXX.tgz]] [-x xetcXX.tgz]" >&2 } trap "restore_bak; clean_src; rm -rf ${WRKDIR}; exit 1" 1 2 3 13 15 |