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

25 files changed, 96 insertions, 110 deletions

diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 8c517c51ab1..c19e7d24129 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: expr.1,v 1.24 2017/08/16 20:10:58 schwarze Exp $
+.\"	$OpenBSD: expr.1,v 1.25 2022/12/22 19:53:22 kn Exp $
 .\"	$NetBSD: expr.1,v 1.9 1995/04/28 23:27:13 jtc Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: August 16 2017 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt EXPR 1
 .Os
 .Sh NAME
@@ -12,11 +12,11 @@
 .Nd evaluate expression
 .Sh SYNOPSIS
 .Nm expr
-.Ar expression
+.Ar expression ...
 .Sh DESCRIPTION
 The
 .Nm
-utility evaluates
+utility evaluates each
 .Ar expression
 and writes the result on standard output.
 All operators are separate arguments to the
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 01116417f17..b0c000474e9 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route.8,v 1.108 2022/12/22 07:46:19 jmc Exp $
+.\"	$OpenBSD: route.8,v 1.109 2022/12/22 19:53:22 kn Exp $
 .\"	$NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -42,8 +42,8 @@
 .Op Fl T Ar rtable
 .Ar command
 .Oo
-.Op Ar modifiers
-.Ar args
+.Op Ar modifier ...
+.Ar arg ...
 .Oc
 .Sh DESCRIPTION
 .Nm
@@ -112,7 +112,7 @@ option.
 .Op Fl T Ar rtable
 .Tg
 .Cm flush
-.Op Ar modifiers
+.Op Ar modifier ...
 .Xc
 Delete all gateway entries from the routing table.
 When the address family is specified by any one of the
@@ -132,7 +132,7 @@ modifiers.
 .Op Fl T Ar rtable
 .Tg
 .Cm get
-.Op Ar modifiers
+.Op Ar modifier ...
 .Ar address
 .Xc
 Extract a routing entry from the kernel.
@@ -147,7 +147,7 @@ same address family as the destination are shown.
 .Op Fl T Ar rtable
 .Tg
 .Cm monitor
-.Op Ar modifiers
+.Op Ar modifier ...
 .Xc
 Continuously report any changes to the routing information base,
 routing lookup misses, or suspected network partitionings.
@@ -303,7 +303,7 @@ have the syntax:
 .Op Fl T Ar rtable
 .Tg
 .Cm add
-.Op Ar modifiers
+.Op Ar modifier ...
 .Ar destination gateway
 .Xc
 .It Xo
@@ -312,7 +312,7 @@ have the syntax:
 .Op Fl T Ar rtable
 .Tg
 .Cm change
-.Op Ar modifiers
+.Op Ar modifier ...
 .Ar destination gateway
 .Xc
 .It Xo
@@ -322,7 +322,7 @@ have the syntax:
 .Tg delete
 .Tg
 .Cm del Ns Op Cm ete
-.Op Ar modifiers
+.Op Ar modifier ...
 .Ar destination gateway
 .Xc
 .El
diff --git a/sbin/route/route.c b/sbin/route/route.c
index fc58858b2a1..05645a6c9e9 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.260 2021/11/10 20:24:22 bket Exp $	*/
+/*	$OpenBSD: route.c,v 1.261 2022/12/22 19:53:22 kn Exp $	*/
 /*	$NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $	*/
 
 /*
@@ -135,9 +135,9 @@ usage(char *cp)
 		warnx("botched keyword: %s", cp);
 	fprintf(stderr,
 #ifndef SMALL
-	    "usage: %s [-dnqtv] [-T rtable] command [[modifiers] args]\n",
+	    "usage: %s [-dnqtv] [-T rtable] command [[modifier ...] arg ...]\n",
 #else
-	    "usage: %s [-dnqtv] command [[modifiers] args]\n",
+	    "usage: %s [-dnqtv] command [[modifier ...] arg ...]\n",
 #endif
 	    __progname);
 	exit(1);
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 5608fea0ab5..16c626f4747 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ddb.4,v 1.104 2022/09/11 06:38:11 jmc Exp $
+.\"	$OpenBSD: ddb.4,v 1.105 2022/12/22 19:53:22 kn Exp $
 .\"	$NetBSD: ddb.4,v 1.5 1994/11/30 16:22:09 jtc Exp $
 .\"
 .\" Mach Operating System
@@ -25,7 +25,7 @@
 .\" any improvements or extensions that they make and grant Carnegie Mellon
 .\" the rights to redistribute these changes.
 .\"
-.Dd $Mdocdate: September 11 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -1018,7 +1018,7 @@ A synonym for
 .Tg machine
 .It Xo
 .Ic mac Ns Op Ic hine
-.Ar subcommand Op Ar args ...
+.Ar subcommand Op Ar arg ...
 .Xc
 Perform a platform-specific command.
 .Pp
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);
 }
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 8f7215fcf6b..2d73b4b0dd9 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csplit.1,v 1.12 2015/10/24 15:32:50 zhuk Exp $
+.\"	$OpenBSD: csplit.1,v 1.13 2022/12/22 19:53:22 kn Exp $
 .\"
 .\" Copyright (c) 2002 Tim J. Robbins.
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.11 2005/01/25 22:29:51 tjr Exp $
 .\"
-.Dd $Mdocdate: October 24 2015 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt CSPLIT 1
 .Os
 .Sh NAME
@@ -37,14 +37,15 @@
 .Op Fl ks
 .Op Fl f Ar prefix
 .Op Fl n Ar number
-.Ar file args ...
+.Ar file
+.Ar arg ...
 .Sh DESCRIPTION
 The
 .Nm
 utility splits
 .Ar file
-into pieces using the patterns
-.Ar args .
+into pieces using the pattern
+.Ar arg .
 If
 .Ar file
 is
@@ -92,8 +93,8 @@ created.
 .El
 .Pp
 The
-.Ar args
-operands may be a combination of the following patterns:
+.Ar arg
+operand may be a combination of the following patterns:
 .Bl -tag -width indent
 .It Xo
 .Sm off
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 45b0e7747f5..a7a3b4b6dfd 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csplit.c,v 1.10 2021/07/08 00:38:42 millert Exp $	*/
+/*	$OpenBSD: csplit.c,v 1.11 2022/12/22 19:53:22 kn Exp $	*/
 /*	$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.9 2004/03/22 11:15:03 tjr Exp $	*/
 
 /*-
@@ -214,7 +214,7 @@ usage(void)
 	extern char *__progname;
 
 	fprintf(stderr,
-	    "usage: %s [-ks] [-f prefix] [-n number] file args ...\n",
+	    "usage: %s [-ks] [-f prefix] [-n number] file arg ...\n",
 	    __progname);
 	exit(1);
 }
diff --git a/usr.bin/doas/doas.1 b/usr.bin/doas/doas.1
index 4d2e09777c8..25827cc7104 100644
--- a/usr.bin/doas/doas.1
+++ b/usr.bin/doas/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
@@ -26,7 +26,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/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
index 5fd9a2b7417..8b684d6006c 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/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>
  *
@@ -40,7 +40,7 @@ static void __dead
 usage(void)
 {
 	fprintf(stderr, "usage: doas [-Lns] [-a style] [-C config] [-u user]"
-	    " command [args]\n");
+	    " command [arg ...]\n");
 	exit(1);
 }
 
diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1
index 931370665f6..e571053cd25 100644
--- a/usr.bin/mandoc/mandoc.1
+++ b/usr.bin/mandoc/mandoc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mandoc.1,v 1.189 2022/08/02 11:55:51 schwarze Exp $
+.\" $OpenBSD: mandoc.1,v 1.190 2022/12/22 19:53:23 kn Exp $
 .\"
 .\" Copyright (c) 2012, 2014-2022 Ingo Schwarze <schwarze@openbsd.org>
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -15,7 +15,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 2 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -765,7 +765,7 @@ Messages displayed by
 follow this format:
 .Bd -ragged -offset indent
 .Nm :
-.Ar file : Ns Ar line : Ns Ar column : level : message : macro arguments
+.Ar file : Ns Ar line : Ns Ar column : level : message : macro argument ...
 .Pq Ar os
 .Ed
 .Pp
@@ -785,9 +785,7 @@ and
 strings are explained below.
 The name of the
 .Ar macro
-triggering the message and its
-.Ar arguments
-are omitted where meaningless.
+triggering the message and its arguments are omitted where meaningless.
 The
 .Ar os
 operating system specifier is omitted for messages that are relevant
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index 419fbe4d108..b28fc0900d6 100644
--- a/usr.bin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.139 2022/07/19 16:08:09 tb Exp $
+.\" $OpenBSD: openssl.1,v 1.140 2022/12/22 19:53:23 kn Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -110,7 +110,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: July 19 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -119,8 +119,8 @@
 .Sh SYNOPSIS
 .Nm
 .Ar command
-.Op Ar command_opts
-.Op Ar command_args
+.Op Ar command_opt ...
+.Op Ar command_arg ...
 .Pp
 .Nm
 .Cm list-standard-commands |
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index e0404b7fc7c..c23fe99f07c 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: su.1,v 1.37 2020/07/08 16:05:27 millert Exp $
+.\"	$OpenBSD: su.1,v 1.38 2022/12/22 19:53:23 kn Exp $
 .\"
 .\" Copyright (c) 1988, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)su.1	6.12 (Berkeley) 7/29/91
 .\"
-.Dd $Mdocdate: July 8 2020 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt SU 1
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Op Fl a Ar auth-type
 .Op Fl c Ar login-class
 .Op Fl s Ar login-shell
-.Op Ar login Op Ar "shell arguments"
+.Op Ar login Op Ar shell-argument ...
 .Ek
 .Sh DESCRIPTION
 The
@@ -168,10 +168,8 @@ and
 options are mutually exclusive; the last one specified
 overrides any previous ones.
 .Pp
-If the optional
-.Ar "shell arguments"
-are provided on the command line, they are passed to the login shell of
-the target login.
+If shell arguments are provided on the command line,
+they are passed to the login shell of the target login.
 This allows it to pass arbitrary commands via the
 .Fl c
 option as understood by most shells.
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index d4fac439274..1ff9d7f036d 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: su.c,v 1.88 2022/03/23 02:18:22 deraadt Exp $	*/
+/*	$OpenBSD: su.c,v 1.89 2022/12/22 19:53:23 kn Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -487,7 +487,7 @@ usage(void)
 
 	fprintf(stderr, "usage: %s [-fKLlm] [-a auth-type] [-c login-class] "
 	    "[-s login-shell]\n"
-	    "%-*s[login [shell arguments]]\n", __progname,
+	    "%-*s[login [shell-argument ...]]\n", __progname,
 	    (int)strlen(__progname) + 8, "");
 	exit(1);
 }
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index fb53ad7010f..4212fca1f1a 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: time.1,v 1.21 2019/01/01 16:17:03 tedu Exp $
+.\"	$OpenBSD: time.1,v 1.22 2022/12/22 19:53:23 kn Exp $
 .\"	$NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 1 2019 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt TIME 1
 .Os
 .Sh NAME
@@ -44,9 +44,7 @@
 .Sh DESCRIPTION
 .Nm
 executes and times
-.Ar utility
-with optional
-.Ar arguments .
+.Ar utility .
 After the
 .Ar utility
 finishes,
diff --git a/usr.bin/timeout/timeout.1 b/usr.bin/timeout/timeout.1
index 406dd0697cf..d2aab6b81b5 100644
--- a/usr.bin/timeout/timeout.1
+++ b/usr.bin/timeout/timeout.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timeout.1,v 1.3 2021/09/04 11:58:31 schwarze Exp $
+.\"	$OpenBSD: timeout.1,v 1.4 2022/12/22 19:53:23 kn Exp $
 .\"	$NetBSD: timeout.1,v 1.4 2016/10/13 06:22:26 dholland Exp $
 .\"
 .\" Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD: head/usr.bin/timeout/timeout.1 268861 2014-07-18 22:56:59Z bapt $
 .\"
-.Dd $Mdocdate: September 4 2021 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt TIMEOUT 1
 .Os
 .Sh NAME
@@ -41,14 +41,12 @@
 .Op Fl -preserve-status
 .Ar duration
 .Ar command
-.Op Ar args
+.Op Ar arg ...
 .Sh DESCRIPTION
 The
 .Nm
 utility executes
-.Ar command ,
-with any
-.Ar args ,
+.Ar command
 and kills it if it is still running after the
 specified
 .Ar duration .
diff --git a/usr.bin/timeout/timeout.c b/usr.bin/timeout/timeout.c
index f93d782f901..24d1c5520ee 100644
--- a/usr.bin/timeout/timeout.c
+++ b/usr.bin/timeout/timeout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timeout.c,v 1.21 2022/07/02 19:00:35 kn Exp $ */
+/* $OpenBSD: timeout.c,v 1.22 2022/12/22 19:53:23 kn Exp $ */
 
 /*
  * Copyright (c) 2021 Job Snijders <job@openbsd.org>
@@ -57,7 +57,7 @@ usage(void)
 	fprintf(stderr,
 	    "usage: timeout [-k time] [-s sig] [--foreground]"
 	    " [--preserve-status] duration\n"
-	    "               command [args]\n");
+	    "               command [arg ...]\n");
 
 	exit(1);
 }
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 3cfc1341f05..9c3cededbe1 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.909 2022/12/16 08:13:40 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.910 2022/12/22 19:53:23 kn Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -14,7 +14,7 @@
 .\" 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: December 16 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -961,7 +961,7 @@ Will run
 directly without invoking the shell.
 .Pp
 .Ar command
-.Op Ar arguments
+.Op Ar argument ...
 refers to a
 .Nm
 command, either passed with the command and arguments separately, for example:
@@ -1538,8 +1538,7 @@ show debugging information about jobs and terminals.
 .Tg source
 .It Xo Ic source-file
 .Op Fl Fnqv
-.Ar path
-.Ar ...
+.Ar path ...
 .Xc
 .D1 Pq alias: Ic source
 Execute commands from one or more files specified by
@@ -3120,7 +3119,7 @@ Commands related to key bindings are as follows:
 .Op Fl nr
 .Op Fl N Ar note
 .Op Fl T Ar key-table
-.Ar key command Op Ar arguments
+.Ar key command Op Ar argument ...
 .Xc
 .D1 Pq alias: Ic bind
 Bind key
@@ -3216,7 +3215,7 @@ lists the command for keys that do not have a note rather than skipping them.
 .Op Fl c Ar target-client
 .Op Fl N Ar repeat-count
 .Op Fl t Ar target-pane
-.Ar key Ar ...
+.Ar key ...
 .Xc
 .D1 Pq alias: Ic send
 Send a key or keys to a window or client.
@@ -5821,8 +5820,7 @@ until it is dismissed.
 .Op Fl y Ar position
 .Ar name
 .Ar key
-.Ar command
-.Ar ...
+.Ar command Op Ar argument ...
 .Xc
 .D1 Pq alias: Ic menu
 Display a menu on
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index db8d3b0735d..2f800d55179 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tput.1,v 1.25 2022/07/25 02:25:56 jsg Exp $
+.\"	$OpenBSD: tput.1,v 1.26 2022/12/22 19:53:24 kn Exp $
 .\"	$NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: July 25 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt TPUT 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm tput
 .Op Fl T Ar term
 .Ar attribute
-.Op Ar attribute-args
+.Op Ar attribute-arg ...
 .Ar ...
 .Nm tput
 .Op Fl T Ar term
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 2fef16cc274..2832b979972 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tput.c,v 1.25 2022/12/04 23:50:49 cheloha Exp $	*/
+/*	$OpenBSD: tput.c,v 1.26 2022/12/22 19:53:24 kn Exp $	*/
 
 /*
  * Copyright (c) 1999 Todd C. Miller <millert@openbsd.org>
@@ -390,7 +390,7 @@ usage(void)
 		(void)fprintf(stderr, "usage: %s [-T term]\n", __progname);
 	else
 		(void)fprintf(stderr,
-		    "usage: %s [-T term] attribute [attribute-args] ...\n"
+		    "usage: %s [-T term] attribute [attribute-arg ...] ...\n"
 		    "       %s [-T term] -S\n", __progname, __progname);
 	exit(1);
 }
diff --git a/usr.sbin/bgpctl/bgpctl.8 b/usr.sbin/bgpctl/bgpctl.8
index 2a85f755ade..b25112b1ad4 100644
--- a/usr.sbin/bgpctl/bgpctl.8
+++ b/usr.sbin/bgpctl/bgpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpctl.8,v 1.102 2022/10/17 15:04:12 claudio Exp $
+.\" $OpenBSD: bgpctl.8,v 1.103 2022/12/22 19:53:24 kn Exp $
 .\"
 .\" Copyright (c) 2003 Henning Brauer <henning@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: October 17 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt BGPCTL 8
 .Os
 .Sh NAME
@@ -127,21 +127,19 @@ Bring the BGP session to the specified neighbor up.
 may be the neighbor's address, description or the word
 .Cm group
 followed by a group description.
-.It Cm network add Ar prefix Op Ar arguments
+.It Cm network add Ar prefix Op Ar argument ...
 Add the specified prefix to the list of announced networks.
-It is possible to set various path attributes with additional
-.Ar arguments .
+It is possible to set various path attributes with additional arguments.
 Adding a prefix will replace an existing equal prefix, including
 prefixes loaded from the configuration.
 .It Xo
 .Cm network bulk
-.Op Ar arguments
+.Op Ar argument ...
 .Op Cm add
 .Xc
 Bulk add specified prefixes to the list of announced networks.
 Prefixes should be sent via stdin.
-It is possible to set various path attributes with additional
-.Ar arguments .
+It is possible to set various path attributes with additional arguments.
 If neither
 .Cm add
 or
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index 58d9ad90388..4baeaaf0b14 100644
--- a/usr.sbin/bgpd/bgpd.conf.5
+++ b/usr.sbin/bgpd/bgpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.conf.5,v 1.226 2022/07/21 12:34:19 claudio Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.227 2022/12/22 19:53:24 kn Exp $
 .\"
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,7 +16,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 21 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt BGPD.CONF 5
 .Os
 .Sh NAME
@@ -730,7 +730,7 @@ More than one
 .Ic import-target
 can be specified.
 .Pp
-.It Ic network Ar arguments ...
+.It Ic network Ar argument ...
 Announce the given networks within this VPN;
 see the
 .Sx NETWORK ANNOUNCEMENTS
diff --git a/usr.sbin/btrace/btrace.8 b/usr.sbin/btrace/btrace.8
index 08e231dd2b1..771e3ce5f4e 100644
--- a/usr.sbin/btrace/btrace.8
+++ b/usr.sbin/btrace/btrace.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: btrace.8,v 1.7 2022/05/01 20:23:11 bluhm Exp $
+.\"	$OpenBSD: btrace.8,v 1.8 2022/12/22 19:53:24 kn Exp $
 .\"
 .\" Copyright (c) 2019 Martin Pieuchot <mpi@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: May 1 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt BTRACE 8
 .Os
 .Sh NAME
@@ -34,8 +34,6 @@ It interprets the
 .Xr bt 5
 program in
 .Ar file
-with optional
-.Ar arguments
 and communicates with the dynamic tracer device using the interface described in
 .Xr dt 4 .
 .Pp
diff --git a/usr.sbin/rcctl/rcctl.8 b/usr.sbin/rcctl/rcctl.8
index 83c90ca9e83..d5e0b02e17d 100644
--- a/usr.sbin/rcctl/rcctl.8
+++ b/usr.sbin/rcctl/rcctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcctl.8,v 1.42 2022/09/13 06:20:38 jmc Exp $
+.\"	$OpenBSD: rcctl.8,v 1.43 2022/12/22 19:53:24 kn Exp $
 .\"
 .\" Copyright (c) 2014 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: September 13 2022 $
+.Dd $Mdocdate: December 22 2022 $
 .Dt RCCTL 8
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm rcctl
 .Cm get Ns | Ns Cm getdef Ns | Ns Cm set
-.Ar service | daemon Op Ar variable Op Ar arguments
+.Ar service | daemon Op Ar variable Op Ar argument ...
 .Nm rcctl
 .Op Fl df
 .Sm off
@@ -146,17 +146,15 @@ command is only needed after enabling a new daemon
 that needs to run before one or more already enabled daemons.
 Specify the new daemon preceded by all that need to run before it,
 but not the ones depending on it.
-.It Cm set Ar service | daemon variable Op Ar arguments
+.It Cm set Ar service | daemon variable Op Ar argument ...
 For a daemon, set the variable
 .Ar daemon Ns _ Ns Ar variable
-to the specified
-.Ar arguments .
+to the specified arguments.
 If
 .Ar variable
 is already set,
 .Ar daemon Ns _ Ns Ar variable
-is reset to the optionally provided
-.Ar arguments
+is reset to the optionally provided arguments.
 or to its default value.
 .Pp
 The
@@ -166,7 +164,7 @@ must be provided with the
 .Cm on
 or
 .Cm off
-.Ar arguments .
+arguments.
 It is used to enable or disable
 .Ar service
 or
diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh
index b2fb53aae12..ffebb1e53b5 100644
--- a/usr.sbin/rcctl/rcctl.sh
+++ b/usr.sbin/rcctl/rcctl.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: rcctl.sh,v 1.114 2022/09/01 07:25:32 ajacoutot Exp $
+# $OpenBSD: rcctl.sh,v 1.115 2022/12/22 19:53:24 kn Exp $
 #
 # Copyright (c) 2014, 2015-2022 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,7 +32,7 @@ usage()
 	for _i in ${_rc_actions}; do _a="$(echo -n ${_i}${_a:+|${_a}})"; done
 
 	_rc_err \
-	"usage:	rcctl get|getdef|set service | daemon [variable [arguments]]
+	"usage:	rcctl get|getdef|set service | daemon [variable [argument ...]]
 	rcctl [-df] ${_a} daemon ...
 	rcctl disable|enable|order [daemon ...]
 	rcctl ls all|failed|off|on|rogue|started|stopped"