Commit: 9b0dc13940e19acbeb6f732f300fa8688745dc1a
Parent: 1bc05b605aed538351e2967e44d824d35b91ea13
Author: kn
Date: Thu, 22 Dec 2022 19:53:22 +0000
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:
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doas.1 b/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.1,v 1.25 2021/01/16 09:18:41 martijn Exp $
+.\" $OpenBSD: doas.1,v 1.26 2022/12/22 19:53:22 kn Exp $
.\"
.\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
.\"
@@ -13,7 +13,7 @@
.\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: January 16 2021 $
+.Dd $Mdocdate: December 22 2022 $
.Dt DOAS 1
.Os
.Sh NAME
@@ -25,7 +25,7 @@
.Op Fl C Ar config
.Op Fl u Ar user
.Ar command
-.Op Ar args
+.Op Ar arg ...
.Sh DESCRIPTION
The
.Nm
diff --git a/doas.c b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.97 2022/03/22 20:36:49 deraadt Exp $ */
+/* $OpenBSD: doas.c,v 1.98 2022/12/22 19:53:22 kn Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
@@ -47,7 +47,7 @@ static void __dead
usage(void)
{
fprintf(stderr, "usage: doas [-Lns] [-C config] [-u user]"
- " command [args]\n");
+ " command [arg ...]\n");
exit(1);
}