diff options
| author |   halex <halex@openbsd.org> | 2013-08-20 22:42:08 +0000 |
|---|---|---|
| committer | halex <halex@openbsd.org> | 2013-08-20 22:42:08 +0000 |
| commit | 4646dd009d0e4a9ef9e640e63b5a2bac7c51b551 (patch) | |
| tree | a7e3eba6d9f65f54bef5791e6fb64275351d815b | |
| parent | Add urtwn(4) to the sgi kernels where it makes sense. I've been using it (diff) | |
| download | wireguard-openbsd-4646dd009d0e4a9ef9e640e63b5a2bac7c51b551.tar.xz wireguard-openbsd-4646dd009d0e4a9ef9e640e63b5a2bac7c51b551.zip | |
use a single line in usage() and SYNOPSIS and explain in text which
combinations are not allowed
discussed with jmc@
| -rw-r--r-- | usr.sbin/fw_update/fw_update.1 | 9 | ||||
| -rw-r--r-- | usr.sbin/fw_update/fw_update.sh | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/fw_update/fw_update.1 b/usr.sbin/fw_update/fw_update.1 index b15a12bc31d..44705432944 100644 --- a/usr.sbin/fw_update/fw_update.1 +++ b/usr.sbin/fw_update/fw_update.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fw_update.1,v 1.13 2013/08/13 20:46:43 halex Exp $ +.\" $OpenBSD: fw_update.1,v 1.14 2013/08/20 22:42:08 halex Exp $ .\" .\" Copyright (c) 2011 Alexander Hall <alexander@beard.se> .\" @@ -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 13 2013 $ +.Dd $Mdocdate: August 20 2013 $ .Dt FW_UPDATE 1 .Os .Sh NAME @@ -23,8 +23,6 @@ .Sh SYNOPSIS .Nm .Op Fl anv -.Nm -.Op Fl nv .Op Ar driver ... .Sh DESCRIPTION The @@ -47,6 +45,9 @@ The options are as follows: .Bl -tag -width Ds .It Fl a Install or update all available firmware. +It is an error to specify this option with any +.Ar driver +arguments. .It Fl n Pass the .Fl n diff --git a/usr.sbin/fw_update/fw_update.sh b/usr.sbin/fw_update/fw_update.sh index fcb81786a1e..696b7328bb0 100644 --- a/usr.sbin/fw_update/fw_update.sh +++ b/usr.sbin/fw_update/fw_update.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $OpenBSD: fw_update.sh,v 1.15 2013/08/20 09:14:31 mpi Exp $ +# $OpenBSD: fw_update.sh,v 1.16 2013/08/20 22:42:08 halex Exp $ # Copyright (c) 2011 Alexander Hall <alexander@beard.se> # # Permission to use, copy, modify, and distribute this software for any @@ -22,8 +22,7 @@ DRIVERS="acx athn bwi ipw iwi iwn malo otus pgt radeondrm rsu uath PKG_ADD="pkg_add -I -D repair" usage() { - echo "usage: ${0##*/} [-anv]" >&2 - echo " ${0##*/} [-nv] [driver ...]" >&2 + echo "usage: ${0##*/} [-anv] [driver ...]" >&2 exit 1 } |