summaryrefslogtreecommitdiff
path: root/usr.bin/cdio
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-12-22 19:53:25 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-12-22 19:53:25 +0000
commitdcd007097b9192d37a4b39e41094f0b07bfbe237 (patch)
tree5d14384480414cca7c4af172ac9a9dec1b03fdb2 /usr.bin/cdio
parent7cffd29be8ddc926f78306a722ae0466ca092588 (diff)
Denote multiple arguments with 'arg ...' not 'args'
A few programs used the plural in their synopsis which doesn't read as clear as the obvious triple-dot notation. mdoc(7) .Ar defaults to "file ..." if no arguments are given and consistent use of 'arg ...' matches that behaviour. Cleanup a few markups of the same argument so the text keeps reading naturally; omit unhelpful parts like 'if optional arguments are given, they are passed along' for tools like time(1) and timeout(1) that obviously execute commands with whatever arguments where given -- just like doas(1) which doesn't mention arguments in its DESCRIPTION in the first place. For expr(1) the difference between 'expressions' and 'expression ...' is crucial, as arguments must be passed as individual words. Feedback millert jmc schwarze deraadt OK jmc
Diffstat (limited to 'usr.bin/cdio')
-rw-r--r--usr.bin/cdio/cdio.16
-rw-r--r--usr.bin/cdio/cdio.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index 2d6c75bc6ee..1e0ad688b1a 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.67 2022/03/31 17:27:24 naddy Exp $
+.\" $OpenBSD: cdio.1,v 1.68 2022/12/22 19:53:22 kn Exp $
.\"
.\" Copyright (c) 1995 Serge V. Vakulenko
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: December 22 2022 $
.Dt CDIO 1
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Op Fl sv
.Op Fl d Ar host : Ns Ar port
.Op Fl f Ar device
-.Op Ar command args ...
+.Op Ar command Op Ar arg ...
.Sh DESCRIPTION
The
.Nm
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index 3abdd942d4e..17022323f45 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdio.c,v 1.84 2022/02/15 08:17:50 jsg Exp $ */
+/* $OpenBSD: cdio.c,v 1.85 2022/12/22 19:53:22 kn Exp $ */
/* Copyright (c) 1995 Serge V. Vakulenko
* All rights reserved.
@@ -227,7 +227,8 @@ help(void)
void
usage(void)
{
- fprintf(stderr, "usage: %s [-sv] [-d host:port] [-f device] [command args ...]\n",
+ fprintf(stderr, "usage: %s [-sv] [-d host:port] [-f device] "
+ "[command [arg ...]]\n",
__progname);
exit(1);
}