ce examples of "Ar arg Ar arg" with "Ar arg arg" and stop the spread;

32 files changed, 132 insertions, 132 deletions

diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 5e06e6bbcc8..43dc1ccd119 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editrc.5,v 1.32 2016/05/22 22:08:42 schwarze Exp $
+.\"	$OpenBSD: editrc.5,v 1.33 2020/04/23 21:28:08 jmc Exp $
 .\"	$NetBSD: editrc.5,v 1.31 2016/04/28 15:50:34 christos Exp $
 .\"
 .\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 22 2016 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt EDITRC 5
 .Os
 .Sh NAME
@@ -182,7 +182,7 @@ if it has any, notably
 .Sq \e
 and
 .Sq ^ .
-.It Ic echotc Oo Fl sv Oc Ar arg Ar ...
+.It Ic echotc Oo Fl sv Oc Ar arg ...
 Exercise terminal capabilities given in
 .Ar arg ... .
 If
@@ -228,7 +228,7 @@ is non zero, only keep unique history entries.
 If
 .Dv n
 is zero, then keep all entries (the default).
-.It Ic settc Ar cap Ar val
+.It Ic settc Ar cap val
 Set the terminal capability
 .Ar cap
 to
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index 94b897518b4..c2c342e8d4e 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atactl.8,v 1.46 2015/02/28 21:51:57 bentley Exp $
+.\"	$OpenBSD: atactl.8,v 1.47 2020/04/23 21:28:08 jmc Exp $
 .\"	$NetBSD: atactl.8,v 1.5 1999/02/24 18:49:14 jwise Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 28 2015 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt ATACTL 8
 .Os
 .Sh NAME
@@ -276,7 +276,7 @@ security system.
 After command completion any other commands that update the device lock mode
 will be aborted.
 .Pp
-.It Li secsetpass Ar user Ar high | maximum
+.It Li secsetpass Ar user high | maximum
 .It Li secsetpass Ar master
 Sets password and security level for the specified device.
 There are two passwords, user and master, and two security levels, high and
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index e341e7edb14..b38c5e74d22 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.139 2020/01/28 18:46:09 otto Exp $
+.\"	$OpenBSD: disklabel.8,v 1.140 2020/04/23 21:28:08 jmc Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: January 28 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@
 .Fl w
 .Op Fl Acdnv
 .Op Fl T Ar file
-.Ar disk Ar disktype
+.Ar disk disktype
 .Op Ar packid
 .Nm disklabel
 .Fl e
@@ -66,7 +66,7 @@
 .Fl R
 .Op Fl nv
 .Op Fl F Ns | Ns Fl f Ar file
-.Ar disk Ar protofile
+.Ar disk protofile
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index b503f421a57..cf67d36e73d 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsdb.8,v 1.19 2017/06/10 14:38:29 schwarze Exp $
+.\"	$OpenBSD: fsdb.8,v 1.20 2020/04/23 21:28:08 jmc Exp $
 .\"	$NetBSD: fsdb.8,v 1.5 1997/01/11 05:51:40 lukem Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2017 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt FSDB 8
 .Os
 .Sh NAME
@@ -126,7 +126,7 @@ Remove the entry
 from the current directory inode.
 This command is valid only if the current inode is a directory.
 .Pp
-.It Cm ln Ar ino Ar name
+.It Cm ln Ar ino name
 Create a link to inode
 .Ar ino
 under the name
@@ -134,13 +134,13 @@ under the name
 in the current directory inode.
 This command is valid only if the current inode is a directory.
 .Pp
-.It Cm chinum Ar dirslot Ar inum
+.It Cm chinum Ar dirslot inum
 Change the i-number in directory entry
 .Ar dirslot
 to
 .Ar inum .
 .Pp
-.It Cm chname Ar dirslot Ar name
+.It Cm chname Ar dirslot name
 Change the name in directory entry
 .Ar dirslot
 to
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 6e362afe9b6..f6efc3bc13e 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.344 2020/02/24 10:05:34 stsp Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.345 2020/04/23 21:28:08 jmc Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ifconfig.8	8.4 (Berkeley) 6/1/94
 .\"
-.Dd $Mdocdate: February 24 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -631,7 +631,7 @@ command for setting the protocol version.
 Set the transmit hold count, which is the number of spanning tree protocol
 packets transmitted before being rate limited.
 Defaults to 6, minimum of 1, maximum of 10.
-.It Cm ifcost Ar interface Ar num
+.It Cm ifcost Ar interface num
 Set the spanning tree path cost of
 .Ar interface
 to
@@ -643,7 +643,7 @@ Automatically calculate the spanning tree priority of
 .Ar interface
 based on the current link speed, interface status, and spanning tree mode.
 This is the default for interfaces added to the bridge.
-.It Cm ifpriority Ar interface Ar num
+.It Cm ifpriority Ar interface num
 Set the spanning tree priority of
 .Ar interface
 to
@@ -1729,7 +1729,7 @@ The default value is 10000.
 .It Cm maxgroup Ar number
 Set the maximum number of groups.
 The default value is 1000.
-.It Cm portno Ar interface Ar number
+.It Cm portno Ar interface number
 Set the port number for the port named
 .Ar interface .
 The default value is the interface index of the
@@ -1916,10 +1916,10 @@ Clear the virtual network identifier.
 .Nm ifconfig
 .Ar umb-interface
 .Op Oo Fl Oc Ns Cm apn Ar apn
-.Op Cm chgpin Ar oldpin Ar newpin
+.Op Cm chgpin Ar oldpin newpin
 .Op Oo Fl Oc Ns Cm class Ar class,class,...
 .Op Cm pin Ar pin
-.Op Cm puk Ar puk Ar newpin
+.Op Cm puk Ar puk newpin
 .Op Oo Fl Oc Ns Cm roaming
 .Ek
 .nr nS 0
@@ -1932,7 +1932,7 @@ interface:
 Set the Access Point Name (APN) required by the network provider.
 .It Cm -apn
 Clear the current APN.
-.It Cm chgpin Ar oldpin Ar newpin
+.It Cm chgpin Ar oldpin newpin
 Permanently change the PIN of the SIM card from the current value
 .Ar oldpin
 to
@@ -1957,7 +1957,7 @@ and deregister with the service provider.
 Enter the PIN required to unlock the SIM card.
 Most SIM cards will not be able to establish a network association without
 providing a PIN.
-.It Cm puk Ar puk Ar newpin
+.It Cm puk Ar puk newpin
 Sets the PIN of the SIM card to
 .Ar newpin
 using the PUK
diff --git a/sbin/iked/iked.conf.5 b/sbin/iked/iked.conf.5
index 5ab4e2c676d..325c338c4fe 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.conf.5,v 1.64 2020/04/23 20:17:48 tobhe Exp $
+.\" $OpenBSD: iked.conf.5,v 1.65 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  All rights reserved.
@@ -158,7 +158,7 @@ have to be placed in
 .Pa /etc/iked/ocsp/responder.crt
 and
 .Pa /etc/iked/ocsp/issuer.crt .
-.It Ic user Ar name Ar password
+.It Ic user Ar name password
 .Xr iked 8
 supports user-based authentication by tunneling the Extensible
 Authentication Protocol (EAP) over IKEv2.
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 3973de47ca2..f69365d9966 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_cd9660.8,v 1.24 2014/02/26 02:21:49 tedu Exp $
+.\"	$OpenBSD: mount_cd9660.8,v 1.25 2020/04/23 21:28:09 jmc Exp $
 .\"	$NetBSD: mount_cd9660.8,v 1.3 1995/04/23 10:33:13 cgd Exp $
 .\"
 .\" Copyright (c) 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: February 26 2014 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_CD9660 8
 .Os
 .Sh NAME
@@ -59,7 +59,7 @@ when using the syntax
 .Bd -ragged -offset 4n
 .Nm mount Op options
 -t cd9660
-.Ar special Ar node
+.Ar special node
 .Ed
 .Pp
 The options are as follows:
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index deae55ffcb2..e65199c487e 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_ext2fs.8,v 1.14 2010/10/14 07:05:43 jmc Exp $
+.\"	$OpenBSD: mount_ext2fs.8,v 1.15 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: October 14 2010 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_EXT2FS 8
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ when using the syntax
 .Bd -ragged -offset 4n
 .Nm mount Op options
 -t ext2fs
-.Ar special Ar node
+.Ar special node
 .Ed
 .Pp
 The
diff --git a/sbin/mount_ffs/mount_ffs.8 b/sbin/mount_ffs/mount_ffs.8
index c1c31b43301..5a97bddab7f 100644
--- a/sbin/mount_ffs/mount_ffs.8
+++ b/sbin/mount_ffs/mount_ffs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_ffs.8,v 1.18 2016/10/06 13:16:21 schwarze Exp $
+.\"	$OpenBSD: mount_ffs.8,v 1.19 2020/04/23 21:28:09 jmc Exp $
 .\"	$NetBSD: mount_ffs.8,v 1.2 1996/02/05 06:33:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: October 6 2016 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_FFS 8
 .Os
 .Sh NAME
@@ -53,11 +53,11 @@ This command is invoked by
 when using any of the following syntax:
 .Bd -ragged -offset 4n
 .Nm mount Op options
-.Ar special Ar node
+.Ar special node
 .br
 .Nm mount Op options
 -t ffs
-.Ar special Ar node
+.Ar special node
 .br
 .Ed
 .Pp
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 6ab9650c486..fb9950161d3 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_msdos.8,v 1.30 2016/10/08 09:34:16 schwarze Exp $
+.\"	$OpenBSD: mount_msdos.8,v 1.31 2020/04/23 21:28:09 jmc Exp $
 .\"	$NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -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: October 8 2016 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_MSDOS 8
 .Os
 .Sh NAME
@@ -59,7 +59,7 @@ when using the syntax
 .Bd -ragged -offset 4n
 .Nm mount Op options
 -t msdos
-.Ar special Ar node
+.Ar special node
 .Ed
 .Pp
 The
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index d3f9f0dd609..de0809c2f8d 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ntfs.8,v 1.15 2014/01/21 03:15:45 schwarze Exp $
+.\" $OpenBSD: mount_ntfs.8,v 1.16 2020/04/23 21:28:09 jmc Exp $
 .\" $NetBSD: mount_ntfs.8,v 1.13 2003/02/14 16:21:48 grant Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -32,7 +32,7 @@
 .\"
 .\"	Id: mount_ntfs.8,v 1.3 1999/05/04 11:34:33 jkoshy Exp
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_NTFS 8
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ when using the syntax
 .Bd -ragged -offset 4h
 .Nm mount Op options
 -t ntfs
-.Ar special Ar node
+.Ar special node
 .Ed
 .Pp
 The
diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8
index 19b972babbe..d1749251223 100644
--- a/sbin/mount_udf/mount_udf.8
+++ b/sbin/mount_udf/mount_udf.8
@@ -1,7 +1,7 @@
-.\" $OpenBSD: mount_udf.8,v 1.12 2014/02/26 02:21:50 tedu Exp $
+.\" $OpenBSD: mount_udf.8,v 1.13 2020/04/23 21:28:09 jmc Exp $
 .\" Written by Pedro Martelletto <pedro@ambientworks.net> in March 2005.
 .\" Public domain.
-.Dd $Mdocdate: February 26 2014 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_UDF 8
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@ when using the syntax
 .Bd -ragged -offset 4n
 .Nm mount Op options
 -t udf
-.Ar special Ar node
+.Ar special node
 .Ed
 .Pp
 The options are as follows:
diff --git a/sbin/mount_vnd/mount_vnd.8 b/sbin/mount_vnd/mount_vnd.8
index 62875a4f5f2..3eea7f27616 100644
--- a/sbin/mount_vnd/mount_vnd.8
+++ b/sbin/mount_vnd/mount_vnd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_vnd.8,v 1.22 2019/04/25 22:39:46 deraadt Exp $
+.\"	$OpenBSD: mount_vnd.8,v 1.23 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -49,7 +49,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: April 25 2019 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt MOUNT_VND 8
 .Os
 .Sh NAME
@@ -100,7 +100,7 @@ when using the following syntax:
 .Bd -ragged -offset 4n
 .Nm mount Op options
 -t vnd
-.Ar image Ar vnd_dev
+.Ar image vnd_dev
 .Ed
 .Pp
 The options are as follows:
diff --git a/share/man/man7/roff.7 b/share/man/man7/roff.7
index fa58834a1b8..f7d1dd892e1 100644
--- a/share/man/man7/roff.7
+++ b/share/man/man7/roff.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: roff.7,v 1.94 2019/07/15 19:20:18 schwarze Exp $
+.\"	$OpenBSD: roff.7,v 1.95 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -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: July 15 2019 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt ROFF 7
 .Os
 .Sh NAME
@@ -624,7 +624,7 @@ Its syntax can be either
 .Pp
 or
 .Bd -literal -offset indent
-.Pf . Ic \&de Ar macroname Ar endmacro
+.Pf . Ic \&de Ar macroname endmacro
 .Ar definition
 .Pf . Ar endmacro
 .Ed
diff --git a/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.8 b/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.8
index 816ef55bd6c..e04b0f5c175 100644
--- a/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.8
+++ b/sys/arch/alpha/stand/setnetbootinfo/setnetbootinfo.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setnetbootinfo.8,v 1.8 2009/02/01 10:48:57 sobrado Exp $
+.\"	$OpenBSD: setnetbootinfo.8,v 1.9 2020/04/23 21:28:10 jmc Exp $
 .\"	$NetBSD: setnetbootinfo.8,v 1.2 1997/04/06 08:41:36 cgd Exp $
 .\"
 .\" Copyright (c) 1997 Christopher G. Demetriou.  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: February 1 2009 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt SETNETBOOTINFO 8 alpha
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .Ar netboot
 .Nm setnetbootinfo
 .Op Fl v
-.Fl u o Ar outfile Ar infile
+.Fl u o Ar outfile infile
 .Sh DESCRIPTION
 The
 .Nm setnetbootinfo
diff --git a/sys/arch/sgi/stand/sgivol/sgivol.8 b/sys/arch/sgi/stand/sgivol/sgivol.8
index 4278830b999..877c0704646 100644
--- a/sys/arch/sgi/stand/sgivol/sgivol.8
+++ b/sys/arch/sgi/stand/sgivol/sgivol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sgivol.8,v 1.6 2008/02/18 15:58:27 jsing Exp $
+.\"	$OpenBSD: sgivol.8,v 1.7 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Copyright (c) 2005 Theo de Raadt
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: February 18 2008 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt SGIVOL 8 sgi
 .Os
 .Sh NAME
@@ -50,11 +50,11 @@
 .Ar disk
 .Nm sgivol
 .Op Fl q
-.Fl r Ar vhfilename Ar diskfilename
+.Fl r Ar vhfilename diskfilename
 .Ar disk
 .Nm sgivol
 .Op Fl q
-.Fl w Ar vhfilename Ar diskfilename
+.Fl w Ar vhfilename diskfilename
 .Ar disk
 .Sh DESCRIPTION
 .Nm
@@ -84,13 +84,13 @@ to the file
 within the filesystem storage space in the volume header.
 .It Fl q
 Be quiet about various diagnostic issues.
-.It Fl r Ar vhfilename Ar diskfilename
+.It Fl r Ar vhfilename diskfilename
 Locate the file
 .Ar vhfilename
 in the storage space of the volume header, and copy it to the
 standard file
 .Ar diskfilename .
-.It Fl w Ar vhfilename Ar diskfilename
+.It Fl w Ar vhfilename diskfilename
 Copy the standard file
 .Ar diskfilename
 to the filesystem storage space in the volume header, placing
diff --git a/usr.bin/snmp/snmp.1 b/usr.bin/snmp/snmp.1
index 37fb91ff4fd..cf1077b5c0f 100644
--- a/usr.bin/snmp/snmp.1
+++ b/usr.bin/snmp/snmp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmp.1,v 1.12 2020/01/21 07:00:34 jmc Exp $
+.\" $OpenBSD: snmp.1,v 1.13 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2019 Martijn van Duren <martijn@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: January 21 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt SNMP 1
 .Os
 .Sh NAME
@@ -98,7 +98,7 @@ is specified it defaults to mib-2
 .Nm snmp
 .Cm bulkget
 .Op Ar options
-.Ar agent Ar oid ...
+.Ar agent oid ...
 .Xc
 Retrieve the next 10 varbinds following each
 .Ar oid
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index e48158b568e..a305b37d137 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.130 2020/04/03 05:53:52 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.131 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,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: April 3 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -635,7 +635,7 @@ Equivalent to
 with the
 .Fl a
 flag set.
-.It Ic rename Ar oldpath Ar newpath
+.It Ic rename Ar oldpath newpath
 Rename remote file from
 .Ar oldpath
 to
@@ -646,7 +646,7 @@ Delete remote file specified by
 .It Ic rmdir Ar path
 Remove remote directory specified by
 .Ar path .
-.It Ic symlink Ar oldpath Ar newpath
+.It Ic symlink Ar oldpath newpath
 Create a symbolic link from
 .Ar oldpath
 to
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 2b0f34ee4fb..6e4ef455e44 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.749 2020/04/22 21:15:33 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.750 2020/04/23 21:28:09 jmc 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: April 22 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -2715,7 +2715,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 Ar command Op Ar arguments
+.Ar key command Op Ar arguments
 .Xc
 .D1 (alias: Ic bind )
 Bind key
@@ -5653,7 +5653,7 @@ A notification will never occur inside an output block.
 .Pp
 The following notifications are defined:
 .Bl -tag -width Ds
-.It Ic %client-session-changed Ar client Ar session-id Ar name
+.It Ic %client-session-changed Ar client session-id name
 The client is now attached to the session with ID
 .Ar session-id ,
 which is named
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index f1f985b6f72..e4e0f54be7b 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.203 2020/04/23 21:10:53 jmc Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.204 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -603,8 +603,8 @@ up
 The VPN properties are as follows:
 .Pp
 .Bl -tag -width Ds -compact
-.It Ic export-target Ar subtype Ar as-number : Ns Ar local
-.It Ic export-target Ar subtype Ar IP : Ns Ar local
+.It Ic export-target Ar subtype as-number : Ns Ar local
+.It Ic export-target Ar subtype IP : Ns Ar local
 Classify announced networks by tagging them with an
 .Em extended community
 of the given arguments.
@@ -632,8 +632,8 @@ routing table.
 The default is
 .Ic yes .
 .Pp
-.It Ic import-target Ar subtype Ar as-number : Ns Ar local
-.It Ic import-target Ar subtype Ar IP : Ns Ar local
+.It Ic import-target Ar subtype as-number : Ns Ar local
+.It Ic import-target Ar subtype IP : Ns Ar local
 The rdomain imports only those prefixes tagged with an
 .Em extended community
 matching an
@@ -1358,15 +1358,15 @@ which is expanded to the locally assigned AS number.
 .Pp
 .It Xo
 .Ic ext-community
-.Ar subtype Ar as-number : Ns Ar local
+.Ar subtype as-number : Ns Ar local
 .Xc
 .It Xo
 .Ic ext-community
-.Ar subtype Ar IP : Ns Ar local
+.Ar subtype IP : Ns Ar local
 .Xc
 .It Xo
 .Ic ext-community
-.Ar subtype Ar numvalue
+.Ar subtype numvalue
 .Xc
 .It Xo
 .Ic ext-community
@@ -1688,15 +1688,15 @@ to do wildcard matching.
 .Pp
 .It Xo
 .Ic ext-community Op Ar delete
-.Ar subtype Ar as-number : Ns Ar local
+.Ar subtype as-number : Ns Ar local
 .Xc
 .It Xo
 .Ic ext-community Op Ar delete
-.Ar subtype Ar IP : Ns Ar local
+.Ar subtype IP : Ns Ar local
 .Xc
 .It Xo
 .Ic ext-community Op Ar delete
-.Ar subtype Ar numvalue
+.Ar subtype numvalue
 .Xc
 .It Xo
 .Ic ext-community Op Ar delete
diff --git a/usr.sbin/eigrpd/eigrpd.conf.5 b/usr.sbin/eigrpd/eigrpd.conf.5
index d822cc48cef..cce8ba01d82 100644
--- a/usr.sbin/eigrpd/eigrpd.conf.5
+++ b/usr.sbin/eigrpd/eigrpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eigrpd.conf.5,v 1.8 2020/02/10 13:18:21 schwarze Exp $
+.\"	$OpenBSD: eigrpd.conf.5,v 1.9 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,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: February 10 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt EIGRPD.CONF 5
 .Os
 .Sh NAME
@@ -150,7 +150,7 @@ Specify an address-family section, grouping one or more autonomous-systems.
 .It Ic autonomous-system Ar number
 Specify the autonomous-system, grouping one or more interfaces.
 Valid range is 1\-65535.
-.It Ic default-metric Ar bandwidth Ar delay Ar reliability Ar load Ar mtu
+.It Ic default-metric Ar bandwidth delay reliability load mtu
 Specify a default metric for all routes redistributed into EIGRP.
 Valid ranges are: 1\-10000000 for the bandwidth, 1\-16777215 for the delay,
 1\-255 for the reliability, 1\-255 for the load and 1\-65535 for the mtu.
@@ -174,12 +174,12 @@ The default value is 4; valid range is 1\-32.
 .Po Ic static Ns | Ns Ic connected Ns | Ns Ic ospf | Ns Ic rip | Ns
 .Ic default Pc
 .Sm on
-.Op Ic metric Ar bandwidth Ar delay Ar reliability Ar load Ar mtu
+.Op Ic metric Ar bandwidth delay reliability load mtu
 .Xc
 .It Xo
 .Op Ic no
 .Ic redistribute Ar prefix
-.Op Ic metric Ar bandwidth Ar delay Ar reliability Ar load Ar mtu
+.Op Ic metric Ar bandwidth delay reliability load mtu
 .Xc
 If set to
 .Ic connected ,
diff --git a/usr.sbin/iscsictl/iscsi.conf.5 b/usr.sbin/iscsictl/iscsi.conf.5
index 3c39c85ffaa..40892b778a4 100644
--- a/usr.sbin/iscsictl/iscsi.conf.5
+++ b/usr.sbin/iscsictl/iscsi.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iscsi.conf.5,v 1.3 2018/06/18 06:04:25 jmc Exp $
+.\" $OpenBSD: iscsi.conf.5,v 1.4 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2012 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: June 18 2018 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt ISCSI.CONF 5
 .Os
 .Sh NAME
@@ -90,7 +90,7 @@ daemon globally.
 .It Xo
 .Ic isid
 .Pq Ic oui Ns | Ns Ic en Ns | Ns Ic rand
-.Ar base Ar qual
+.Ar base qual
 .Xc
 The Initiator Session ID
 .Ic isid
diff --git a/usr.sbin/ldomctl/ldomctl.8 b/usr.sbin/ldomctl/ldomctl.8
index 93d29ff38fc..acf4077b20a 100644
--- a/usr.sbin/ldomctl/ldomctl.8
+++ b/usr.sbin/ldomctl/ldomctl.8
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ldomctl.8,v 1.27 2020/01/17 22:49:54 kn Exp $
+.\"     $OpenBSD: ldomctl.8,v 1.28 2020/04/23 21:28:09 jmc Exp $
 .\"
 .\" Copyright (c) 2012 Mark Kettenis <kettenis@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: January 17 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt LDOMCTL 8 sparc64
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@ information about domains running on the system.
 .Pp
 The following commands are available:
 .Bl -tag -width Ds
-.It Cm create-vdisk Fl s Ar size Ar file
+.It Cm create-vdisk Fl s Ar size file
 Create a virtual disk image with the specified
 .Ar file
 path and
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index 0f2c979963e..bc207d86a29 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpq.1,v 1.12 2016/03/17 07:18:34 jmc Exp $
+.\"	$OpenBSD: lpq.1,v 1.13 2020/04/23 21:28:10 jmc Exp $
 .\"	$NetBSD: lpq.1,v 1.11 2002/01/19 03:23:11 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)lpq.1	8.2 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: March 17 2016 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt LPQ 1
 .Os
 .Sh NAME
@@ -40,8 +40,8 @@
 .Nm lpq
 .Op Fl al
 .Op Fl P Ns Ar printer
-.Op Ar job# Ar ...
-.Op Ar user Ar ...
+.Op Ar job# ...
+.Op Ar user ...
 .Sh DESCRIPTION
 .Nm lpq
 examines the spooling area used by
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index c4ecf6be6fe..44a4bee8db5 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lprm.1,v 1.11 2013/01/17 21:39:29 jmc Exp $
+.\"	$OpenBSD: lprm.1,v 1.12 2020/04/23 21:28:10 jmc Exp $
 .\"	$NetBSD: lprm.1,v 1.10 2002/01/19 03:23:47 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)lprm.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt LPRM 1
 .Os
 .Sh NAME
@@ -41,8 +41,8 @@
 .Op Fl
 .Op Fl P Ns Ar printer
 .Oo
-.Op Ar job# Ar ...
-.Op Ar user Ar ...
+.Op Ar job# ...
+.Op Ar user ...
 .Oc
 .Sh DESCRIPTION
 .Nm lprm
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index f2431a20c26..173a8aa5834 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.117 2020/02/20 16:44:01 espie Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.118 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd $Mdocdate: February 20 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -310,7 +310,7 @@ The following annotations can be inserted manually (but commonly
 is used for creating most packing-list contents):
 .Pp
 .Bl -tag -width Ds -compact
-.It Cm @ask-update Ar pkgspec Ar message
+.It Cm @ask-update Ar pkgspec message
 Mechanism to prevent unwanted updates.
 If the new package is installed as part of an update matching
 .Ar pkgspec ,
@@ -398,7 +398,7 @@ If
 does not begin with an @, same as
 .Dl name/
 .Pp
-.It Cm @define-tag Ar tag Ar mode Ar params
+.It Cm @define-tag Ar tag mode params
 Define a tag of name
 .Ar tag .
 Tags define actions to be performed at specific time during
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 42b4acc535d..80a85a33104 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pstat.8,v 1.57 2020/02/08 01:09:58 jsg Exp $
+.\"	$OpenBSD: pstat.8,v 1.58 2020/04/23 21:28:10 jmc Exp $
 .\"	$NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)pstat.8	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: February 8 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt PSTAT 8
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Op Fl fknsTtv
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Op Fl d Ar format Ar symbol ...
+.Op Fl d Ar format symbol ...
 .Sh DESCRIPTION
 .Nm
 displays open file entry, swap space utilization,
@@ -57,7 +57,7 @@ is specified.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl d Ar format Ar symbol ...
+.It Fl d Ar format symbol ...
 Print the values of
 .Ar symbol
 using the specified format.
diff --git a/usr.sbin/radiusd/radiusd.conf.5 b/usr.sbin/radiusd/radiusd.conf.5
index 13a41d3f925..d98548048d5 100644
--- a/usr.sbin/radiusd/radiusd.conf.5
+++ b/usr.sbin/radiusd/radiusd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: radiusd.conf.5,v 1.13 2020/04/23 21:10:54 jmc Exp $
+.\"	$OpenBSD: radiusd.conf.5,v 1.14 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Copyright (c) 2014 Esdenera Networks GmbH
 .\" Copyright (c) 2014 Internet Initiative Japan Inc.
@@ -85,7 +85,7 @@ The
 .Dq radius
 module provides authentication from upstream RADIUS servers.
 .El
-.It Ic module set Ar module Ar key Ar value ...
+.It Ic module set Ar module key value ...
 Configure the module specific configurations by
 .Ar key
 and
diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5
index 0a68c8a56a4..6f380595d8d 100644
--- a/usr.sbin/relayd/relayd.conf.5
+++ b/usr.sbin/relayd/relayd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.conf.5,v 1.194 2020/02/10 13:18:21 schwarze Exp $
+.\"	$OpenBSD: relayd.conf.5,v 1.195 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -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: February 10 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt RELAYD.CONF 5
 .Os
 .Sh NAME
@@ -1205,7 +1205,7 @@ and can be either
 or
 .Ic VERSION-CONTROL .
 .It Xo
-.Ar type Ar option
+.Ar type option
 .Oo Oo Ic digest Oc
 .Pq Ar key Ns | Ns Ic file Ar path
 .Oo Ic value Ar value Oc Oc
diff --git a/usr.sbin/smtpd/aliases.5 b/usr.sbin/smtpd/aliases.5
index 802ca9a6b51..7c250c815f2 100644
--- a/usr.sbin/smtpd/aliases.5
+++ b/usr.sbin/smtpd/aliases.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aliases.5,v 1.15 2018/05/24 11:38:24 gilles Exp $
+.\"	$OpenBSD: aliases.5,v 1.16 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.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 24 2018 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt ALIASES 5
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ will only use the part that precedes
 .Sq +
 as a
 .Em key .
-.It Ar error : Ns Ar code Ar message
+.It Ar error : Ns Ar code message
 A status code and message to return.
 The code must be 3 digits,
 starting 4XX (TempFail) or 5XX (PermFail).
diff --git a/usr.sbin/smtpd/smtpd-filters.7 b/usr.sbin/smtpd/smtpd-filters.7
index 1e1a27efb91..f0c4707e9e7 100644
--- a/usr.sbin/smtpd/smtpd-filters.7
+++ b/usr.sbin/smtpd/smtpd-filters.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd-filters.7,v 1.4 2020/01/06 13:42:42 gilles Exp $
+.\"	$OpenBSD: smtpd-filters.7,v 1.5 2020/04/23 21:28:10 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: January 6 2020 $
+.Dd $Mdocdate: April 23 2020 $
 .Dt FILTERS 7
 .Os
 .Sh NAME
@@ -213,7 +213,7 @@ mail.openbsd.org|pass|199.185.178.25:33174|45.77.67.80:25
 .Pp
 The list of events and event-specific parameters are provided here for smtp-in:
 .Bl -tag -width Ds
-.It Ic link-connect : Ar rdns Ar fcrdns Ar src Ar dest
+.It Ic link-connect : Ar rdns fcrdns src dest
 This event is generated upon connection.
 .Pp
 .Ar rdns
@@ -244,7 +244,7 @@ This event is generated upon display of the server banner.
 .Pp
 .Ar hostname
 contains the hostname displayed in the banner.
-.It Ic link-identify : Ar method Ar identity
+.It Ic link-identify : Ar method identity
 This event is generated upon
 .Dq HELO
 or
@@ -268,7 +268,7 @@ contains a colon-separated list of TLS properties including the TLS version,
 the cipher suite used by the session and the cipher strenght in bits.
 .It Ic link-disconnect
 This event is generated upon disconnection of the client.
-.It Ic link-auth : Ar username Ar result
+.It Ic link-auth : Ar username result
 This event is generated upon authentication attempt of the client.
 .Pp
 .Ar username
@@ -292,7 +292,7 @@ This event is generated when a transaction is initiated.
 .Pp
 .Ar message-id
 contains the identifier for the transaction.
-.It Ic tx-mail : Ar message-id Ar address Ar result
+.It Ic tx-mail : Ar message-id Ar address result
 This event is generated when client emits
 .Dq MAIL FROM .
 .Pp
@@ -318,7 +318,7 @@ if it was rejected
 or
 .Dq tempfail
 if it was rejected for a transient error.
-.It Ic tx-rcpt : Ar message-id Ar address Ar result
+.It Ic tx-rcpt : Ar message-id Ar address result
 This event is generated when client emits
 .Dq RCPT TO .
 .Pp
@@ -391,7 +391,7 @@ It contains the raw response as emitted by the server.
 .Pp
 .Ar response
 contains the response emitted by the server to the client.
-.It Ic filter-report : Ar filter-kind Ar name Ar message
+.It Ic filter-report : Ar filter-kind Ar name message
 This event is generated when a filter emits a report.
 .Pp
 .Ar filter-kind may be either
@@ -407,7 +407,7 @@ is the name of the filter that generated the report.
 .Pp
 .Ar message
 is a filter-specific message.
-.It Ic filter-response : Ar phase Ar response Op param
+.It Ic filter-response : Ar phase response Op param
 This event is generated when a filter responds to a filtering request.
 .Pp
 .Ar phase
@@ -543,7 +543,7 @@ filter-dataline|7641df9771b4ed00|1ef1c203cc576e5d|.
 .Pp
 The list of events and event-specific parameters are provided here for smtp-in:
 .Bl -tag -width Ds
-.It Ic connect : Ar rdns Ar fcrdns Ar src Ar dest
+.It Ic connect : Ar rdns fcrdns src dest
 This request is emitted after connection,
 before the banner is displayed.
 .It Ic helo : Ar identity
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index 7e01722f4bf..6a22beb60c6 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: zic.8,v 1.2 2015/02/16 16:21:25 bentley Exp $
-.Dd $Mdocdate: February 16 2015 $
+.\"	$OpenBSD: zic.8,v 1.3 2020/04/23 21:28:10 jmc Exp $
+.Dd $Mdocdate: April 23 2020 $
 .Dt ZIC 8
 .Os
 .Sh NAME
@@ -14,7 +14,7 @@
 .Op Fl l Ar timezone
 .Op Fl p Ar timezone
 .Op Fl y Ar command
-.Op Ar filename Ar ...
+.Op Ar filename ...
 .Ek
 .Sh DESCRIPTION
 .Nm
@@ -135,7 +135,7 @@ is something else, then
 .Nm
 executes the command
 .Pp
-.Dl yearistype Ar year Ar type
+.Dl yearistype Ar year type
 .Pp
 to check the type of a year:
 an exit status of zero is taken to mean that the year is of the given type;