From 31524921f01f28c9bd1362a5c1f73d2d3432d975 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 10 Nov 2015 19:01:05 +0100
Subject: [PATCH] Remove unnecessary whitespace in macro arguments in some
 manual pages.

---
 bin/mkdir/mkdir.1               |  5 ++-
 bin/pax/pax.1                   |  5 ++-
 bin/rcp/rcp.1                   |  9 +++--
 bin/stty/stty.1                 |  2 +-
 lib/libc/gen/fts.3              |  3 +-
 lib/libc/gen/tzset.3            |  2 +-
 lib/libc/sys/chflags.2          |  3 +-
 lib/libc/sys/getsockopt.2       |  3 +-
 lib/libc/sys/pipe.2             |  3 +-
 lib/libc/sys/sigaction.2        |  2 +-
 lib/libipsec/ipsec_set_policy.3 |  5 ++-
 lib/libprop/prop_array_util.3   |  4 +--
 lib/libstand/libstand.3         |  2 +-
 lib/libusb/libusb20.3           |  4 +--
 share/man/man3/tgmath.3         |  2 +-
 share/man/man4/inet.4           |  2 +-
 share/man/man4/ng_socket.4      |  2 +-
 share/man/man4/termios.4        |  2 +-
 share/man/man7/hostname.7       |  5 ++-
 share/man/man7/nls.7            |  2 +-
 share/man/man9/VFS_CHECKEXP.9   |  2 +-
 share/man/man9/ieee80211.9      |  2 +-
 share/man/man9/ioctl.9          |  2 +-
 usr.bin/col/col.1               |  3 +-
 usr.bin/gcore/gcore.1           |  3 +-
 usr.bin/hexdump/hexdump.1       |  2 +-
 usr.bin/keylogin/keylogin.1     |  3 +-
 usr.bin/locate/locate/locate.1  |  4 +--
 usr.bin/logger/logger.1         |  5 ++-
 usr.bin/lorder/lorder.1         |  3 +-
 usr.bin/mkfifo/mkfifo.1         |  3 +-
 usr.bin/msgs/msgs.1             |  5 ++-
 usr.bin/mt/mt.1                 |  2 +-
 usr.bin/printenv/printenv.1     |  5 ++-
 usr.bin/rdist/rdist.1           | 22 ++++++------
 usr.bin/rlogin/rlogin.1         | 11 +++---
 usr.bin/script/script.1         |  3 +-
 usr.bin/shar/shar.1             |  9 +++--
 usr.bin/systat/systat.1         |  3 +-
 usr.bin/telnet/telnet.1         | 37 ++++++++++---------
 usr.bin/tftp/tftp.1             |  3 +-
 usr.bin/tip/tip.1               | 64 ++++++++++++++++-----------------
 usr.bin/vgrind/vgrindefs.5      |  5 ++-
 usr.bin/window/window.1         | 62 ++++++++++++++++----------------
 usr.sbin/lpr/lpq/lpq.1          | 15 ++++----
 usr.sbin/lpr/lpr/lpr.1          |  9 +++--
 usr.sbin/lpr/lprm/lprm.1        |  3 +-
 usr.sbin/mtree/mtree.8          |  5 ++-
 usr.sbin/sliplogin/sliplogin.8  |  3 +-
 49 files changed, 168 insertions(+), 197 deletions(-)

diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 341905e5e2..386beab63d 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -30,7 +30,6 @@
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
 .\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.12.2.5 2002/07/14 21:42:14 keramida Exp $
-.\" $DragonFly: src/bin/mkdir/mkdir.1,v 1.4 2008/05/02 02:05:03 swildner Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
@@ -42,7 +41,7 @@
 .Nm
 .Op Fl pv
 .Op Fl m Ar mode
-.Ar directory_name  ...
+.Ar directory_name ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -50,7 +49,7 @@ utility creates the directories named as operands, in the order specified,
 using mode
 .Li rwxrwxrwx (\&0777)
 as modified by the current
-.Xr umask  2  .
+.Xr umask 2 .
 .Pp
 The options are as follows:
 .Bl -tag -width indent
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index d33db8c3d6..7d8145d6d6 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -31,7 +31,6 @@
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
 .\" $FreeBSD: src/bin/pax/pax.1,v 1.12.2.10 2003/02/23 17:46:34 keramida Exp $
-.\" $DragonFly: src/bin/pax/pax.1,v 1.4 2007/10/20 17:56:46 swildner Exp $
 .\"
 .Dd March 27, 2009
 .Dt PAX 1
@@ -732,9 +731,9 @@ Pathnames stored by this format must be 100 characters or less in length.
 Only
 .Em regular
 files,
-.Em  hard links , soft links ,
+.Em hard links , soft links ,
 and
-.Em  directories
+.Em directories
 will be archived (other file system types are not supported).
 For backwards compatibility with even older tar formats, a
 .Fl o
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 0c0c821ced..212db0d80c 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD: src/bin/rcp/rcp.1,v 1.9.2.6 2002/08/16 20:06:34 ume Exp $
-.\" $DragonFly: src/bin/rcp/rcp.1,v 1.2 2003/06/17 04:22:50 dillon Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
@@ -79,12 +78,12 @@ Cause
 .Nm
 to attempt to preserve (duplicate) in its copies the modification
 times and modes of the source files, ignoring the
-.Ar umask  .
+.Ar umask .
 By default, the mode and owner of
 .Ar file2
 are preserved if it already existed; otherwise the mode of the source file
 modified by the
-.Xr umask  2
+.Xr umask 2
 on the destination host is used.
 .It Fl r
 If any of the source files are directories,
@@ -108,7 +107,7 @@ is not a full path name, it is interpreted relative to
 the login directory of the specified user
 .Ar ruser
 on
-.Ar rhost  ,
+.Ar rhost ,
 or your current user name if no other remote user name is specified.
 A
 .Ar path
@@ -119,7 +118,7 @@ The
 .Nm
 utility does not prompt for passwords; it performs remote execution
 via
-.Xr rsh  1  ,
+.Xr rsh 1 ,
 and requires the same authorization.
 .Pp
 The
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 2225a89fb3..4f7beca60e 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -418,7 +418,7 @@ Enable parenb and cs7; disable
 parodd.
 .It Cm oddp
 Enable parenb, cs7, and parodd.
-.It Fl parity , evenp ,  oddp
+.It Fl parity , evenp , oddp
 Disable parenb, and set cs8.
 .It Cm \&nl Pq Fl \&nl
 Enable (disable) icrnl.
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 1183d10f6b..b5eb8f6029 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $
-.\" $DragonFly: src/lib/libc/gen/fts.3,v 1.4 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd January 26, 2008
 .Dt FTS 3
@@ -163,7 +162,7 @@ With the exception of directories without errors
 all of these
 entries are terminal, that is, they will not be revisited, nor will any
 of their descendants be visited.
-.Bl  -tag -width FTS_DEFAULT
+.Bl -tag -width FTS_DEFAULT
 .It Dv FTS_D
 A directory being visited in pre-order.
 .It Dv FTS_DC
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 2ae7e9205f..bc20395d88 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -225,7 +225,7 @@ The zero-based Julian day
 .Em n
 \*(Le 365 ) .
 Leap days are counted, and it is possible to refer to February 29.
-.It Sy M  Em m.n.d
+.It Sy M Em m.n.d
 The
 .Em d Ns 'th
 day (0 \*(Le
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 2a409bc514..920c6bbd4e 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
 .\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.11.2.7 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/chflags.2,v 1.5 2008/11/11 00:55:49 pavalos Exp $
 .\"
 .Dd February 13, 2015
 .Dt CHFLAGS 2
@@ -44,7 +43,7 @@
 .In sys/stat.h
 .In unistd.h
 .Ft int
-.Fn chflags "const char *path"  "u_long flags"
+.Fn chflags "const char *path" "u_long flags"
 .Ft int
 .Fn lchflags "const char *path" "u_long flags"
 .Ft int
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 44e6e0e19a..68d2fc5e38 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.12.2.11 2002/01/09 17:44:15 yar Exp $
-.\" $DragonFly: src/lib/libc/sys/getsockopt.2,v 1.5 2007/07/14 21:48:15 swildner Exp $
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
@@ -141,7 +140,7 @@ and set with
 .It Dv SO_REUSEPORT Ta "enables duplicate address and port bindings"
 .It Dv SO_KEEPALIVE Ta "enables keep connections alive"
 .It Dv SO_DONTROUTE Ta "enables routing bypass for outgoing messages"
-.It Dv SO_LINGER  Ta "linger on close if data present"
+.It Dv SO_LINGER Ta "linger on close if data present"
 .It Dv SO_BROADCAST Ta "enables permission to transmit broadcast messages"
 .It Dv SO_OOBINLINE Ta "enables reception of out-of-band data in band"
 .It Dv SO_SNDBUF Ta "set buffer size for output"
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 7c19062095..7d71ff70ee 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/pipe.2,v 1.13.2.5 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/pipe.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
 .\"
 .Dd June 4, 1993
 .Dt PIPE 2
@@ -81,7 +80,7 @@ By convention, the first descriptor is normally used as the
 .Em read end
 of the pipe,
 and the second is normally the
-.Em write end  ,
+.Em write end ,
 so that data written to
 .Fa fildes[1]
 appears on (i.e., can be read from)
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 0e05bc8208..942c708af4 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -381,7 +381,7 @@ Base Interfaces:
 .Fn sigaddset ,
 .Fn sigdelset ,
 .Fn sigemptyset ,
-.Fn sigfillset  ,
+.Fn sigfillset ,
 .Fn sigismember ,
 .Fn signal ,
 .Fn sigpending ,
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index 32ea4fcb94..5292939f96 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -1,6 +1,5 @@
 .\"	$KAME: ipsec_set_policy.3,v 1.15 2001/08/17 07:21:36 itojun Exp $
 .\"	$FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.3.2.10 2002/12/29 16:35:36 schweikh Exp $
-.\"	$DragonFly: src/lib/libipsec/ipsec_set_policy.3,v 1.5 2008/04/15 19:19:49 swildner Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
@@ -94,7 +93,7 @@ It is caller's responsibility to reclaim the region, by using
 .Pp
 .Fa policy
 is formatted as either of the following:
-.Bl -tag  -width "discard"
+.Bl -tag -width "discard"
 .It Ar direction Li discard
 .Ar direction
 must be
@@ -126,7 +125,7 @@ means that the matching packets are subject to IPsec processing.
 can be followed by one or more
 .Ar request
 string, which is formatted as below:
-.Bl -tag  -width "discard"
+.Bl -tag -width "discard"
 .It Xo
 .Ar protocol
 .Li /
diff --git a/lib/libprop/prop_array_util.3 b/lib/libprop/prop_array_util.3
index 97a1b46a18..abb86ae2c1 100644
--- a/lib/libprop/prop_array_util.3
+++ b/lib/libprop/prop_array_util.3
@@ -140,7 +140,7 @@
 .Ft bool
 .Fn prop_array_add_uint8 "prop_array_t dict" "uint8_t val"
 .Ft bool
-.Fn prop_array_add_int16 "prop_array_t dict"  "int16_t val"
+.Fn prop_array_add_int16 "prop_array_t dict" "int16_t val"
 .Ft bool
 .Fn prop_array_add_uint16 "prop_array_t dict" "uint16_t val"
 .Ft bool
@@ -148,7 +148,7 @@
 .Ft bool
 .Fn prop_array_add_uint32 "prop_array_t dict" "uint32_t val"
 .Ft bool
-.Fn prop_array_add_int64 "prop_array_t dict"  "int64_t val"
+.Fn prop_array_add_int64 "prop_array_t dict" "int64_t val"
 .Ft bool
 .Fn prop_array_add_uint64 "prop_array_t dict" "uint64_t val"
 .\"
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 8b5b2cd7af..3d3f21efe7 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -287,7 +287,7 @@ The following standard conversions
 are supported:
 .Cm c , d , n , o , p , s , u , x .
 The following modifiers are supported:
-.Cm + , - , # , * , 0 , field width,  precision,  l .
+.Cm + , - , # , * , 0 , field width , precision , l .
 .Pp
 The
 .Cm b
diff --git a/lib/libusb/libusb20.3 b/lib/libusb/libusb20.3
index 75b7dd7946..ba9efd502a 100644
--- a/lib/libusb/libusb20.3
+++ b/lib/libusb/libusb20.3
@@ -51,7 +51,7 @@
 .Ft int
 .Fn libusb20_tr_open_stream "struct libusb20_transfer *xfer" "uint32_t max_buf_size" "uint32_t max_frame_count" "uint8_t ep_no" "uint16_t stream_id"
 .Ft struct libusb20_transfer*
-.Fn libusb20_tr_get_pointer "struct libusb20_device *pdev"  "uint16_t tr_index"
+.Fn libusb20_tr_get_pointer "struct libusb20_device *pdev" "uint16_t tr_index"
 .Ft uint16_t
 .Fn libusb20_tr_get_time_complete "struct libusb20_transfer *xfer"
 .Ft uint32_t
@@ -201,7 +201,7 @@
 .Ft struct libusb20_backend *
 .Fn libusb20_be_alloc_linux "void"
 .Ft struct libusb20_device *
-.Fn libusb20_be_device_foreach  "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
+.Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
 .Ft void
 .Fn libusb20_be_dequeue_device "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
 .Ft void
diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3
index 684a4d8f28..f0ba5d0fdb 100644
--- a/share/man/man3/tgmath.3
+++ b/share/man/man3/tgmath.3
@@ -94,7 +94,7 @@ Otherwise, the real equivalent is called.
 .It Fn atanh Ta Fn atanh Ta Fn catanh
 .It Fn cos Ta Fn cos Ta Fn ccos
 .It Fn sin Ta Fn sin Ta Fn csin
-.It Fn tan  Ta Fn tan Ta Fn ctan
+.It Fn tan Ta Fn tan Ta Fn ctan
 .It Fn cosh Ta Fn cosh Ta Fn ccosh
 .It Fn sinh Ta Fn sinh Ta Fn csinh
 .It Fn tanh Ta Fn tanh Ta Fn ctanh
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 93fe9f9244..586fd4c93e 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -40,7 +40,7 @@
 .Sh DESCRIPTION
 The Internet protocol family is a collection of protocols
 layered atop the
-.Em Internet  Protocol
+.Em Internet Protocol
 .Pq Tn IP
 transport layer, and utilizing the Internet address format.
 The Internet family provides protocol support for the
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 98f0b62f2d..d10165c518 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -109,7 +109,7 @@ on which the data was received or should be sent.
 .Pp
 As a special case, to allow netgraph data sockets to be used as stdin or stdout
 on naive programs, a
-.Xr sendto  2
+.Xr sendto 2
 with a NULL sockaddr pointer, a
 .Xr send 2
 or a
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index c7fb10e955..54dc79e0fc 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -1412,7 +1412,7 @@ the system defaults, consult the header file
 .It Dv VEOL Ta EOL Ta _POSIX_VDISABLE
 .It Dv VEOL2 Ta EOL2 Ta _POSIX_VDISABLE
 .It Dv VERASE Ta ERASE Ta \&^? Ql \&\e177
-.It Dv VWERASE  Ta WERASE Ta \&^W
+.It Dv VWERASE Ta WERASE Ta \&^W
 .It Dv VKILL Ta KILL Ta \&^U
 .It Dv VREPRINT Ta REPRINT Ta \&^R
 .It Dv VINTR Ta INTR Ta \&^C
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 08b67942d0..ba7fd6a979 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD: src/share/man/man7/hostname.7,v 1.5.2.1 2001/08/17 13:08:49 ru Exp $
-.\" $DragonFly: src/share/man/man7/hostname.7,v 1.2 2003/06/17 04:37:00 dillon Exp $
 .\"
 .Dd December 30, 1993
 .Dt HOSTNAME 7
@@ -47,7 +46,7 @@ subdomain of the EDU subdomain of the Internet would be represented as
 Hostnames are often used with network client and server programs,
 which must generally translate the name to an address for use.
 (This function is generally performed by the library routine
-.Xr gethostbyname  3  . )
+.Xr gethostbyname 3 . )
 Hostnames are resolved by the Internet name resolver in the following
 fashion.
 .Pp
@@ -79,7 +78,7 @@ Lithium.CChem.EDU will not be tried, as there is only one component
 remaining from the local domain.
 The search path can be changed from the default
 by a system-wide configuration file (see
-.Xr resolver  5  ) .
+.Xr resolver 5 ) .
 .Sh SEE ALSO
 .Xr gethostbyname 3 ,
 .Xr resolver 5 ,
diff --git a/share/man/man7/nls.7 b/share/man/man7/nls.7
index d44ebd915c..688a57492a 100644
--- a/share/man/man7/nls.7
+++ b/share/man/man7/nls.7
@@ -473,7 +473,7 @@ Conversion is controlled by the
 .Xr mblen 3 ,
 .Xr mbrlen 3 ,
 and
-.Xr  mbsinit 3 .
+.Xr mbsinit 3 .
 .It
 Wide characters are used directly for I/O, using
 .Xr getwchar 3 ,
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index 0388e66ed6..0acc64e64a 100644
--- a/share/man/man9/VFS_CHECKEXP.9
+++ b/share/man/man9/VFS_CHECKEXP.9
@@ -34,7 +34,7 @@
 .In sys/param.h
 .In sys/mount.h
 .Ft int
-.Fn VFS_CHECKEXP "struct mount *mp" "struct mbuf  *nam" "int *exflagsp" "struct ucred **credanonp"
+.Fn VFS_CHECKEXP "struct mount *mp" "struct mbuf *nam" "int *exflagsp" "struct ucred **credanonp"
 .Sh DESCRIPTION
 This is used by the NFS server to check if a mount point is exported
 to a client.
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index 5926000fc0..7c677c8194 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -235,7 +235,7 @@ Memory allocated by the driver must be tagged with
 to balance the memory allocation statistics.
 .It Dv ic_node_free
 Reclaim storage of a node allocated by
-.Dv ic_node_alloc  .
+.Dv ic_node_alloc .
 Drivers are expected to
 .Em interpose
 their own method to cleanup private state but must call through
diff --git a/share/man/man9/ioctl.9 b/share/man/man9/ioctl.9
index 99a3487166..2e53a15189 100644
--- a/share/man/man9/ioctl.9
+++ b/share/man/man9/ioctl.9
@@ -69,7 +69,7 @@ ioctl(fd, MYDEVIOCTL, ...)
 .It Fn fun
 A macro which can be one of:
 .Bl -tag -width ".Fn _IOWR"
-.It Fn  _IO
+.It Fn _IO
 The call is a simple message to the kernel by itself.
 It does not copy anything into the kernel, nor does it want anything back.
 .It Fn _IOR
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 40fa248a6e..2e16c97626 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -30,7 +30,6 @@
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
 .\" $FreeBSD: src/usr.bin/col/col.1,v 1.4.2.7 2002/07/15 04:32:27 keramida Exp $
-.\" $DragonFly: src/usr.bin/col/col.1,v 1.2 2003/06/17 04:29:25 dillon Exp $
 .\"
 .Dd June 29, 1993
 .Dt COL 1
@@ -51,7 +50,7 @@ feeds, and replaces white-space characters with tabs where possible.
 This can be useful in processing the output of
 .Xr nroff 1
 and
-.Xr tbl  1 .
+.Xr tbl 1 .
 .Pp
 The
 .Nm
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 63f0cce69a..f5294985ed 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.8.2.5 2002/07/15 06:25:27 keramida Exp $
-.\" $DragonFly: src/usr.bin/gcore/gcore.1,v 1.2 2003/06/17 04:29:27 dillon Exp $
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
@@ -46,7 +45,7 @@ The
 .Nm
 utility creates a core image of the specified process,
 suitable for use with
-.Xr gdb  1 .
+.Xr gdb 1 .
 By default, the core is written to the file
 .Dq Pa core.<pid> .
 The process identifier,
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 7c6b3cedf4..57bf9673e9 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -261,7 +261,7 @@ strings.
 .Pp
 The default and supported byte counts for the conversion characters
 are as follows:
-.Bl -tag -width  "Xc,_Xc,_Xc,_Xc,_Xc,_Xc" -offset indent
+.Bl -tag -width "Xc,_Xc,_Xc,_Xc,_Xc,_Xc" -offset indent
 .It Li \&%_c , \&%_p , \&%_u , \&%c
 One byte counts only.
 .It Xo
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index aba553ffa7..3c919189aa 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,7 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.5.2.2 2002/06/21 15:27:23 charnier Exp $
-.\" $DragonFly: src/usr.bin/keylogin/keylogin.1,v 1.2 2003/06/17 04:29:27 dillon Exp $
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
@@ -26,6 +25,6 @@ to be used by any secure network services, such as NFS.
 .Xr chkey 1 ,
 .Xr keylogout 1 ,
 .Xr login 1 ,
-.Xr publickey  5 ,
+.Xr publickey 5 ,
 .Xr keyserv 8 ,
 .Xr newkey 8
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 9616b0d8e2..977ef3a608 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -45,7 +45,7 @@
 The
 .Nm
 program searches a database for all pathnames which match the specified
-.Ar pattern  .
+.Ar pattern .
 The database is recomputed periodically (usually weekly or daily),
 and contains the pathnames
 of all files which are publicly accessible.
@@ -58,7 +58,7 @@ Shell globbing and quoting characters
 and
 .Dq \&] )
 may be used in
-.Ar pattern  ,
+.Ar pattern ,
 although they will have to be escaped from the shell.
 Preceding any character with a backslash
 .Pq Dq \e
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index dafa6edf71..163cac7b78 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.4.2.8 2003/05/25 20:06:57 brueffer Exp $
-.\" $DragonFly: src/usr.bin/logger/logger.1,v 1.3 2006/02/17 19:39:09 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
@@ -47,7 +46,7 @@
 The
 .Nm
 utility provides a shell command interface to the
-.Xr syslog  3
+.Xr syslog 3
 system log module.
 .Pp
 The following options are available:
@@ -91,7 +90,7 @@ facility.
 The default is ``user.notice.''
 .It Fl t Ar tag
 Mark every line in the log with the specified
-.Ar tag  .
+.Ar tag .
 .It Ar message
 Write the message to log; if not specified, and the
 .Fl f
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index da00188ef4..2f08701af1 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)lorder.1	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD: src/usr.bin/lorder/lorder.1,v 1.5.2.1 2002/06/21 15:28:00 charnier Exp $
-.\" $DragonFly: src/usr.bin/lorder/lorder.1,v 1.2 2003/06/17 04:29:28 dillon Exp $
 .\"
 .Dd April 28, 1995
 .Dt LORDER 1
@@ -51,7 +50,7 @@ utility outputs a list of file names where the first file contains a symbol
 which is defined by the second file.
 .Pp
 The output is normally used with
-.Xr tsort  1
+.Xr tsort 1
 when a library is created to determine the optimum ordering of the
 object modules so that all references may be resolved in a single
 pass of the loader.
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 29d3cc125c..363266e7f3 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -30,7 +30,6 @@
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
 .\" $FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.6.2.4 2002/06/21 15:28:15 charnier Exp $
-.\" $DragonFly: src/usr.bin/mkfifo/mkfifo.1,v 1.3 2006/02/17 19:39:09 swildner Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
@@ -41,7 +40,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl m Ar mode
-.Ar fifo_name  ...
+.Ar fifo_name ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 1fd5cb939d..6004ea294e 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.9.2.7 2002/07/15 07:19:24 keramida Exp $
-.\" $DragonFly: src/usr.bin/msgs/msgs.1,v 1.2 2003/06/17 04:29:29 dillon Exp $
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
@@ -93,7 +92,7 @@ the default ``Messages''.
 .It Fl m
 A copy of the specified message is placed in a temporary
 mailbox and
-.Xr mail  1
+.Xr mail 1
 is invoked on that mailbox.
 Both `m' and `s' accept a numeric argument in place of the `\-'.
 .El
@@ -197,7 +196,7 @@ messages back from the one indicated in the
 file, useful for reviews of recent messages.
 .It Fl p
 Pipe long messages through
-.Xr more  1  .
+.Xr more 1 .
 .El
 .Pp
 Within
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 92d0a95cd2..717438a3b7 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -48,7 +48,7 @@ By default
 .Nm
 performs the requested operation once.  Operations
 may be performed multiple times by specifying
-.Ar count  .
+.Ar count .
 Note
 that
 .Ar tapename
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index 00be7965d2..72bd56d672 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -29,7 +29,6 @@
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6.2.10 2002/06/26 08:25:30 tjr Exp $
-.\" $DragonFly: src/usr.bin/printenv/printenv.1,v 1.3 2005/08/05 22:35:11 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
@@ -73,9 +72,9 @@ The option
 .Ar name Ns = Ns Ar value
 specifies
 an environment variable,
-.Ar name  ,
+.Ar name ,
 with a value of
-.Ar value  .
+.Ar value .
 .Pp
 The options are as follows:
 .Bl -tag -width indent
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index e28bfb02e5..80b2aae5a0 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -85,7 +85,7 @@ to use as the input.
 If no names are specified on the command line,
 .Nm
 will update all of the files and directories listed in
-.Ar distfile  .
+.Ar distfile .
 Otherwise, the argument is taken to be the name of a file to be updated
 or the label of a command to execute.
 If label and file names conflict,
@@ -99,7 +99,7 @@ Options specific to the second SYNOPSIS form:
 Forces
 .Nm
 to interpret the remaining arguments as a small
-.Ar distfile  .
+.Ar distfile .
 .Pp
 The equivalent distfile is as follows.
 .Pp
@@ -128,11 +128,11 @@ compatible with
 Define
 .Ar var
 to have
-.Ar value  .
+.Ar value .
 The
 .Fl d
 option is used to define or override variable definitions in the
-.Ar distfile  .
+.Ar distfile .
 .Ar Value
 can be the empty string, one name, or a list of names surrounded by
 parentheses and separated by tabs and/or spaces.
@@ -150,12 +150,12 @@ Limit which machines are to be updated.
 Multiple
 .Fl m
 arguments can be given to limit updates to a subset of the hosts listed in the
-.Ar distfile  .
+.Ar distfile .
 .It Fl n
 Print the commands without executing them.
 This option is
 useful for debugging
-.Ar distfile  .
+.Ar distfile .
 .It Fl q
 Quiet mode.
 Files that are being modified are normally
@@ -190,7 +190,7 @@ Files are normally updated if their
 and
 .Ar size
 (see
-.Xr stat  2  )
+.Xr stat 2 )
 disagree.
 The
 .Fl y
@@ -253,7 +253,7 @@ or
 .Pp
 The shell meta-characters `[', `]', `{', `}', `*', and `?'
 are recognized and expanded (on the local host only) in the same way as
-.Xr csh  1  .
+.Xr csh 1 .
 They can be escaped with a backslash.
 The `~' character is also expanded in the same way as
 .Xr csh 1
@@ -317,7 +317,7 @@ The
 command is used to update all of the files in the source list
 .Ic except
 for the files listed in
-.Ar name list  .
+.Ar name list .
 This is usually used to copy everything in a directory except certain files.
 .Pp
 The
@@ -341,7 +341,7 @@ must be escaped with `\e'.
 The
 .Ic special
 command is used to specify
-.Xr sh  1
+.Xr sh 1
 commands that are to be executed on the
 remote host after the file in
 .Ar name list
@@ -351,7 +351,7 @@ If the
 is omitted then the shell commands will be executed
 for every file updated or installed.  The shell variable `FILE' is set
 to the current filename before executing the commands in
-.Ar string  .
+.Ar string .
 .Ar String
 starts and ends with `"' and can cross multiple lines in
 .Ar distfile .
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index d1711c6be9..279a84ba31 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.11.2.7 2002/06/21 15:28:48 charnier Exp $
-.\" $DragonFly: src/usr.bin/rlogin/rlogin.1,v 1.3 2006/02/17 19:39:10 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
@@ -47,7 +46,7 @@
 The
 .Nm
 utility starts a terminal session on a remote host
-.Ar host  .
+.Ar host .
 .Pp
 The
 .Nm
@@ -119,7 +118,7 @@ option requests rlogin to obtain tickets for the remote host
 in realm
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl l
 The
 .Fl l
@@ -170,7 +169,7 @@ Each user may have a private authorization list in the file
 in their home directory.
 Each line in this file should contain a Kerberos principal name of the
 form
-.Ar principal.instance@realm  .
+.Ar principal.instance@realm .
 If the originating user is authenticated to one of the principals named
 in
 .Pa .klogin ,
@@ -183,7 +182,7 @@ there is no
 file.
 Otherwise a login and password will be prompted for on the remote machine
 as in
-.Xr login  1  .
+.Xr login 1 .
 To avoid certain security problems, the
 .Pa .klogin
 file must be owned by
@@ -234,7 +233,7 @@ IPv6 support was added by WIDE/KAME project.
 The
 .Nm
 utility will be replaced by
-.Xr telnet  1
+.Xr telnet 1
 in the near future.
 .Pp
 More of the environment should be propagated.
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 8c0fa1e0c1..9ae6c6f651 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/script/script.1,v 1.12.2.4 2002/06/21 15:29:06 charnier Exp $
-.\" $DragonFly: src/usr.bin/script/script.1,v 1.2 2003/06/17 04:29:31 dillon Exp $
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
@@ -58,7 +57,7 @@ is given,
 saves all dialogue in
 .Ar file .
 If no file name is given, the typescript is saved in the file
-.Pa typescript  .
+.Pa typescript .
 .Pp
 If the argument
 .Ar command ...
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 08fcab0547..a6ffea1694 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/shar/shar.1,v 1.7.2.2 2001/08/16 13:17:03 ru Exp $
-.\" $DragonFly: src/usr.bin/shar/shar.1,v 1.3 2006/02/17 19:39:10 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
@@ -53,12 +52,12 @@ utility does this correctly).
 The
 .Nm
 command is normally used for distributing files by
-.Xr ftp  1
+.Xr ftp 1
 or
-.Xr mail  1  .
+.Xr mail 1 .
 .Sh EXAMPLES
 To create a shell archive of the program
-.Xr ls  1
+.Xr ls 1
 and mail it to Rick:
 .Bd -literal -offset indent
 cd ls
@@ -99,7 +98,7 @@ It is easy to insert trojan horses into
 files.
 It is strongly recommended that all shell archive files be examined
 before running them through
-.Xr sh  1  .
+.Xr sh 1 .
 Archives produced using this implementation of
 .Nm
 may be easily examined with the command:
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 413bb6f3d3..e823407abe 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.23.2.9 2002/12/29 16:35:40 schweikh Exp $
-.\" $DragonFly: src/usr.bin/systat/systat.1,v 1.8 2008/09/02 11:50:46 matthias Exp $
 .\"
 .Dd May 24, 2015
 .Dt SYSTAT 1
@@ -146,7 +145,7 @@ Supplying only a number will set the refresh interval to this value.
 Exit
 .Nm .
 (This may be abbreviated to
-.Ic q  . )
+.Ic q . )
 .El
 .Pp
 The available displays are:
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 5ac8f6cfb8..a9fb18ee28 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -27,7 +27,6 @@
 .\"
 .\"	@(#)telnet.1	8.6 (Berkeley) 6/1/94
 .\" $FreeBSD: src/crypto/telnet/telnet/telnet.1,v 1.4.2.9 2002/04/13 10:59:08 markm Exp $
-.\" $DragonFly: src/crypto/telnet/telnet/telnet.1,v 1.2 2003/06/17 04:24:37 dillon Exp $
 .\"
 .Dd August 26, 2009
 .Dt TELNET 1
@@ -276,7 +275,7 @@ toggle is
 .Dv TRUE
 (the default for \*(Lqold line by line\*(Rq; see below),
 the user's
-.Ic quit  ,
+.Ic quit ,
 .Ic intr ,
 and
 .Ic flush
@@ -312,7 +311,7 @@ sequence) and flush previous terminal input
 (in the case of
 .Ic quit
 and
-.Ic intr  ) .
+.Ic intr ) .
 .Pp
 While connected to a remote host,
 .Nm
@@ -326,11 +325,11 @@ The following
 commands are available.
 Only enough of each command to uniquely identify it need be typed
 (this is also true for arguments to the
-.Ic mode  ,
+.Ic mode ,
 .Ic set ,
-.Ic toggle  ,
+.Ic toggle ,
 .Ic unset ,
-.Ic slc  ,
+.Ic slc ,
 .Ic environ ,
 and
 .Ic display
@@ -583,7 +582,7 @@ will attempt to contact a
 .Tn TELNET
 server at the default port.
 The host specification may be either a host name (see
-.Xr hosts  5  ) ,
+.Xr hosts 5 ) ,
 an Internet address specified in the \*(Lqdot notation\*(Rq (see
 .Xr inet 3 ) ,
 or IPv6 host name or IPv6 coloned-hexadecimal address.
@@ -1063,11 +1062,11 @@ mapped to
 commands sequences (like
 .Ic ip
 or
-.Ic quit  )
+.Ic quit )
 or line editing characters (like
 .Ic erase
 and
-.Ic kill  ) .
+.Ic kill ) .
 By default, the local special characters are exported.
 .Bl -tag -width Fl
 .It Ic check
@@ -1130,7 +1129,7 @@ and
 are both
 .Dv TRUE ,
 then when the
-.Ic ao  ,
+.Ic ao ,
 or
 .Ic quit
 characters are recognized (and transformed into
@@ -1152,7 +1151,7 @@ if the terminal user had not
 done an "stty noflsh", otherwise
 .Dv FALSE
 (see
-.Xr stty  1  ) .
+.Xr stty 1 ) .
 .It Ic autodecrypt
 When the
 .Dv TELNET ENCRYPT
@@ -1244,7 +1243,7 @@ The initial value for this toggle is
 .Dv FALSE .
 .It Ic debug
 Toggles socket level debugging (useful only to the
-.Ic super user  ) .
+.Ic super user ) .
 The initial value for this toggle is
 .Dv FALSE .
 .It Ic encdebug
@@ -1253,9 +1252,9 @@ Turns on debugging information for the encryption code.
 If this is
 .Dv TRUE ,
 then the
-.Ic flush  ,
+.Ic flush ,
 .Ic interrupt ,
-.Ic quit  ,
+.Ic quit ,
 .Ic erase ,
 and
 .Ic kill
@@ -1265,12 +1264,12 @@ above) are recognized locally, and transformed into (hopefully) appropriate
 .Tn TELNET
 control sequences
 (respectively
-.Ic ao  ,
+.Ic ao ,
 .Ic ip ,
-.Ic brk  ,
+.Ic brk ,
 .Ic ec ,
 and
-.Ic el  ;
+.Ic el ;
 see
 .Ic send
 above).
@@ -1291,7 +1290,7 @@ If
 has ever been enabled, then
 .Ic quit
 is sent as
-.Ic abort  ,
+.Ic abort ,
 and
 .Ic eof
 and
@@ -1359,7 +1358,7 @@ commands.
 Suspend
 .Nm .
 This command only works when the user is using the
-.Xr csh  1  .
+.Xr csh 1 .
 .It Ic \&! Op Ar command
 Execute a single command in a subshell on the local
 system.  If
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 7b0f04b9eb..9f270be017 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/tftp/tftp.1,v 1.4.2.7 2002/06/21 15:29:33 charnier Exp $
-.\" $DragonFly: src/usr.bin/tftp/tftp.1,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
@@ -96,7 +95,7 @@ commands.
 .Pp
 .It Cm get Ar filename
 .It Cm get Ar remotename localname
-.It Cm get Ar file1 file2 ...  fileN
+.It Cm get Ar file1 file2 ... fileN
 Get a file or set of files from the specified
 .Ar sources .
 .Ar Source
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 22ac3757b0..277245cebe 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -204,7 +204,7 @@ to find how to reach a particular
 system and to find out how it should operate while talking
 to the system;
 refer to
-.Xr remote  5
+.Xr remote 5
 for a full description.
 Each system has a default baud rate with which to
 establish a connection.  If this value is not suitable, the baud rate
@@ -261,7 +261,7 @@ utility uses the file
 .Pa /etc/modems
 to find out how to operate with a particular
 modem; refer to
-.Xr modems  5
+.Xr modems 5
 for a full description.
 .Ss VARIABLES
 The
@@ -273,9 +273,9 @@ Some of these variables are read-only to normal users (root is allowed
 to change anything of interest).  Variables may be displayed
 and set through the ``s'' escape.  The syntax for variables is patterned
 after
-.Xr vi  1
+.Xr vi 1
 and
-.Xr Mail  1  .
+.Xr Mail 1 .
 Supplying ``all''
 as an argument to the set command displays all variables readable by
 the user.  Alternatively, the user may request display of a particular
@@ -303,32 +303,32 @@ their abbreviations, and their default values.
 .It Ar beautify
 (bool) Discard unprintable characters when a session is being scripted;
 abbreviated
-.Ar be  .
+.Ar be .
 .It Ar baudrate
 (num) The baud rate at which the connection was established;
 abbreviated
-.Ar ba  .
+.Ar ba .
 .It Ar chardelay
 (num) Number of milliseconds to delay after the transmission of
 each character;
 abbreviated
-.Ar cdelay  .
+.Ar cdelay .
 .It Ar dialtimeout
 (num) When dialing a phone number, the time (in seconds)
 to wait for a connection to be established; abbreviated
-.Ar dial  .
+.Ar dial .
 .It Ar echocheck
 (bool) Synchronize with the remote host during file transfer by
 waiting for the echo of the last character transmitted; default is
-.Ar off  .
+.Ar off .
 .It Ar eofread
 (str) The set of characters which signify an end-of-transmission
 during a ~< file transfer command; abbreviated
-.Ar eofr  .
+.Ar eofr .
 .It Ar eofwrite
 (str) The string sent to indicate end-of-transmission during
 a ~> file transfer command; abbreviated
-.Ar eofw  .
+.Ar eofw .
 .It Ar eol
 (str) The set of characters which indicate an end-of-line.
 The
@@ -336,54 +336,54 @@ The
 utility will recognize escape characters only after an end-of-line.
 .It Ar escape
 (char) The command prefix (escape) character; abbreviated
-.Ar es  ;
+.Ar es ;
 default value is `~'.
 .It Ar exceptions
 (str) The set of characters which should not be discarded
 due to the beautification switch; abbreviated
-.Ar ex  ;
+.Ar ex ;
 default value is ``\et\en\ef\eb''.
 .It Ar force
 (char) The character used to force literal data transmission;
 abbreviated
-.Ar fo  ;
+.Ar fo ;
 default value is `^P'.
 .It Ar framesize
 (num) The amount of data (in bytes) to buffer between file system
 writes when receiving files; abbreviated
-.Ar fr  .
+.Ar fr .
 .It Ar host
 (str) The name of the host to which you are connected; abbreviated
-.Ar ho  .
+.Ar ho .
 .It Ar linedelay
 (num) Number of milliseconds to delay after the transmission of
 each line;
 abbreviated
-.Ar ldelay  .
+.Ar ldelay .
 .It Ar login
 (str) Pathname of a login shell script to run once connected; standard input
 and output are redirected to the remote host.
 Leading tildes in the pathname
 are expanded expansion; abbreviated
-.Ar li  .
+.Ar li .
 .It Ar logout
 (str) Pathname of a shell script to run before disconnecting; standard input
 and output are redirected to the remote host.
 Leading tildes in the pathname
 are expanded expansion; abbreviated
-.Ar lo  .
+.Ar lo .
 .It Ar prompt
 (char) The character which indicates an end-of-line on the remote
 host; abbreviated
-.Ar pr  ;
+.Ar pr ;
 default value is `\en'.  This value is used to synchronize during
 data transfers.  The count of lines transferred during a file transfer
 command is based on receipt of this character.
 .It Ar raise
 (bool) Upper case mapping mode; abbreviated
-.Ar ra  ;
+.Ar ra ;
 default value is
-.Ar off  .
+.Ar off .
 When this mode is enabled, all lower case letters will be mapped to
 upper case by
 .Nm
@@ -391,26 +391,26 @@ for transmission to the remote machine.
 .It Ar raisechar
 (char) The input character used to toggle upper case mapping mode;
 abbreviated
-.Ar rc  ;
+.Ar rc ;
 default value is `^A'.
 .It Ar record
 (str) The name of the file in which a session script is recorded;
 abbreviated
-.Ar rec  ;
+.Ar rec ;
 default value is ``tip.record''.
 .It Ar script
 (bool) Session scripting mode; abbreviated
-.Ar sc  ;
+.Ar sc ;
 default is
-.Ar off  .
+.Ar off .
 When
 .Ar script
 is
-.Li true  ,
+.Li true ,
 .Nm
 will record everything transmitted by the remote machine in
 the script record file specified in
-.Ar record  .
+.Ar record .
 If the
 .Ar beautify
 switch is on, only printable
@@ -423,15 +423,15 @@ is used to indicate characters which are an exception to the normal
 beautification rules.
 .It Ar tabexpand
 (bool) Expand tabs to spaces during file transfers; abbreviated
-.Ar tab  ;
+.Ar tab ;
 default value is
-.Ar false  .
+.Ar false .
 Each tab is expanded to 8 spaces.
 .It Ar verbose
 (bool) Verbose mode; abbreviated
-.Ar verb  ;
+.Ar verb ;
 default is
-.Ar true  .
+.Ar true .
 When verbose mode is enabled,
 .Nm
 prints messages while dialing, shows the current number
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index a882eebc5d..526dbf2144 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/vgrind/vgrindefs.5,v 1.5.2.4 2001/08/16 13:17:13 ru Exp $
-.\" $DragonFly: src/usr.bin/vgrind/vgrindefs.5,v 1.4 2008/05/02 02:05:07 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
@@ -76,7 +75,7 @@ comments are normally starting with
 while the string
 .Ql $#
 is an operator on an array.
-.Sh REGULAR  EXPRESSIONS
+.Sh REGULAR EXPRESSIONS
 .Nm Vgrindefs
 uses regular expression which are very similar to those of
 .Xr ex 1
@@ -117,7 +116,7 @@ string delimiter in a string by escaping it.
 Unlike other regular expressions in the system,  these match words
 and not characters.  Hence something like "(tramp|steamer)flies?"
 would match "tramp", "steamer", "trampflies", or "steamerflies".
-.Sh KEYWORD  LIST
+.Sh KEYWORD LIST
 The keyword list is just a list of keywords in the language separated
 by spaces.  If the "oc" boolean is specified, indicating that upper
 and lower case are equivalent, then all the keywords should be
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index db57c61604..fbdb5dbabf 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -91,14 +91,14 @@ and create the two default
 windows instead.
 .It Fl e Ar escape-char
 Set the escape character to
-.Ar escape-char  .
+.Ar escape-char .
 .Ar Escape-char
 can be a single character, or in the form
 .Ic ^X
 where
 .Ar X
 is any character, meaning
-.No control- Ns Ar X  .
+.No control- Ns Ar X .
 .It Fl c Ar command
 Execute the string
 .Ar command
@@ -116,7 +116,7 @@ This one-character
 identifier, as well as a user definable label string, are displayed
 with the window on the top edge of its frame.
 A window can be designated to be in the
-.Ar foreground  ,
+.Ar foreground ,
 in which case it will always be
 on top of all normal, non-foreground windows, and can be covered
 only by other foreground windows.
@@ -156,7 +156,7 @@ entry tailored to this window is created
 and passed as environment (see
 .Xr environ 7 )
 variable
-.Ev TERMCAP  .
+.Ev TERMCAP .
 The termcap entry contains the window's size and
 characteristics as well as information from the physical terminal,
 such as the existence of underline, reverse video, and other display
@@ -211,7 +211,7 @@ to
 corresponding to the windows 1 to 9.
 .Ic ^X
 means
-.No control- Ns Ar X  ,
+.No control- Ns Ar X ,
 where
 .Ar X
 is any character.
@@ -699,7 +699,7 @@ as a statement, the parentheses surrounding
 the argument list may be omitted.
 Aliases return no value.
 .El
-.Ss  Builtin Functions
+.Ss Builtin Functions
 The arguments are listed by name in their natural order.
 Optional arguments are in square brackets
 .Sq Op .
@@ -740,12 +740,12 @@ Close the windows specified in
 If
 .Aq Ar window-list
 is the word
-.Ar all  ,
+.Ar all ,
 than all windows are closed.
 No value is returned.
 .It Ic cursormodes Ns Pq Bq Ar modes
 Set the window cursor to
-.Ar modes  .
+.Ar modes .
 .Ar Modes
 is the bitwise
 or of the mode bits defined as the variables
@@ -766,7 +766,7 @@ sets the window cursors to blinking
 reverse video.
 .It Ic default_nline Ns Pq Bq Ar nline
 Set the default buffer size to
-.Ar nline  .
+.Ar nline .
 Initially, it is
 48 lines.
 Returns the old default buffer size.
@@ -779,7 +779,7 @@ Returns
 the first string in the old shell setting.
 Default is no change.
 Initially, the default shell is taken from the environment variable
-.Ev SHELL  .
+.Ev SHELL .
 .It Ic default_smooth Ns Pq Bq Ar flag
 Set the default value of the
 .Ar smooth
@@ -788,12 +788,12 @@ to the command
 .Nm
 (see below).
 The argument is a boolean flag (one of
-.Ar on  ,
-.Ar off  ,
-.Ar yes  ,
-.Ar no  ,
-.Ar true  ,
-.Ar false  ,
+.Ar on ,
+.Ar off ,
+.Ar yes ,
+.Ar no ,
+.Ar true ,
+.Ar false ,
 or a number,
 as described above).
 Default is no change.
@@ -818,7 +818,7 @@ No value is returned.
 Default is the current window.
 .It Ic escape Ns Pq Bq Ar escapec
 Set the escape character to
-.Ar escape-char  .
+.Ar escape-char .
 Returns the old
 escape character as a one-character string.
 Default is no change.
@@ -851,7 +851,7 @@ is no change.
 Set the label of
 .Nm
 to
-.Ar label  .
+.Ar label .
 Returns the old
 label as a string.
 Default for
@@ -873,11 +873,11 @@ The previous current window is returned.
 Default is no change.
 .It Ic source Ns Pq Ar filename
 Read and execute the long commands in
-.Ar filename  .
+.Ar filename .
 Returns \-1 if the file cannot be read, 0 otherwise.
 .It Ic terse Ns Pq Bq flag
 Set terse mode to
-.Ar flag  .
+.Ar flag .
 In terse mode, the command window
 stays hidden even in command mode, and errors are reported by
 sounding the terminal's bell.
@@ -890,14 +890,14 @@ Returns the old terse flag.
 Default is no change.
 .It Ic unalias Ns Pq Ar alias
 Undefine
-.Ar alias  .
+.Ar alias .
 Returns -1 if
 .Ar alias
 does not exist,
 0 otherwise.
 .It Ic unset Ns Pq Ar variable
 Undefine
-.Ar variable  .
+.Ar variable .
 Returns -1 if
 .Ar variable
 does not exist,
@@ -921,20 +921,20 @@ No value is returned.
 .Bq Ar shell ) .
 .Xc
 Open a window with upper left corner at
-.Ar row  ,
+.Ar row ,
 .Ar column
 and size
-.Ar nrow  ,
-.Ar ncol  .
+.Ar nrow ,
+.Ar ncol .
 If
 .Ar nline
 is specified,
 then that many lines are allocated for the text buffer.
 Otherwise, the default buffer size is used.
 Default values for
-.Ar row  ,
-.Ar column  ,
-.Ar nrow  ,
+.Ar row ,
+.Ar column ,
+.Ar nrow ,
 and
 .Ar ncol
 are, respectively,
@@ -942,8 +942,8 @@ the upper, left-most, lower, or right-most extremes of the
 screen.
 .Ar Label
 is the label string.
-.Ar Frame  ,
-.Ar pty  ,
+.Ar Frame ,
+.Ar pty ,
 and
 .Ar mapnl
 are flag values
@@ -972,7 +972,7 @@ command (see above).
 is a list of strings that will be used as the shell
 program to place in the window (default is the program specified
 by
-.Ar default_shell  ,
+.Ar default_shell ,
 see above).
 The created window's identifier is returned as a number.
 .It Xo
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index 5729df74d9..188da96f82 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)lpq.1	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD: src/usr.sbin/lpr/lpq/lpq.1,v 1.5.2.4 2002/06/21 16:40:46 charnier Exp $
-.\" $DragonFly: src/usr.sbin/lpr/lpq/lpq.1,v 1.4 2008/05/02 02:05:08 swildner Exp $
 .\"
 .Dd April 28, 1995
 .Dt LPQ 1
@@ -40,13 +39,13 @@
 .Op Fl a
 .Op Fl l
 .Op Fl P Ns Ar printer
-.Op  job # ...\&
-.Op  user ...\&
+.Op job # ...\&
+.Op user ...\&
 .Sh DESCRIPTION
 The
 .Nm
 utility examines the spooling area used by
-.Xr lpd  8
+.Xr lpd 8
 for printing files on the line printer, and reports the status of the
 specified jobs or all jobs associated with a user.
 The
@@ -73,12 +72,12 @@ rather than just the specified printer.
 .El
 .Pp
 For each job submitted (i.e. invocation of
-.Xr lpr  1  )
+.Xr lpr 1 )
 .Nm
 reports the user's name, current rank in the queue, the
 names of files comprising the job, the job identifier (a number which
 may be supplied to
-.Xr lprm  1
+.Xr lprm 1
 for removing a specific job), and the total size in bytes.
 Job ordering is dependent on
 the algorithm used to scan the spooling directory and is supposed
@@ -87,7 +86,7 @@ to be
 (First in First Out).
 File names comprising a job may be unavailable
 (when
-.Xr lpr  1
+.Xr lpr 1
 is used as a sink in a pipeline) in which case the file
 is indicated as ``(standard input)''.
 .Pp
@@ -95,7 +94,7 @@ If
 .Nm
 warns that there is no daemon present (i.e. due to some malfunction),
 the
-.Xr lpc  8
+.Xr lpc 8
 command can be used to restart the printer daemon.
 .Sh ENVIRONMENT
 If the following environment variable exists, it is used by
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index da7f2d02dd..cbb9b1023e 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -27,8 +27,7 @@
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11.2.6 2002/06/21 16:40:52 charnier Exp $
-.\" $DragonFly: src/usr.sbin/lpr/lpr/lpr.1,v 1.4 2006/02/17 19:40:17 swildner Exp $
-.\" "
+.\"
 .Dd June 6, 1993
 .Dt LPR 1
 .Os
@@ -134,7 +133,7 @@ Use symbolic links.  Usually files are copied to the spool directory.
 The
 .Fl s
 option will use
-.Xr symlink  2
+.Xr symlink 2
 to link data files rather than trying to copy them so large files can be
 printed.  This means the files should
 not be modified or removed until they have been printed.
@@ -166,7 +165,7 @@ instead.
 Specifies a
 .Ar font
 to be mounted on font position
-.Ar i  .
+.Ar i .
 The daemon
 will construct a
 .Li .railmag
@@ -180,7 +179,7 @@ lpr \-C EECS foo.c
 .Ed
 .Pp
 causes the system name (the name returned by
-.Xr hostname  1  )
+.Xr hostname 1 )
 to be replaced on the burst page by
 .Tn EECS ,
 and the file foo.c to be printed.
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index b86de7815a..7e695a7425 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)lprm.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.sbin/lpr/lprm/lprm.1,v 1.5.2.5 2002/06/21 16:40:54 charnier Exp $
-.\" $DragonFly: src/usr.sbin/lpr/lprm/lprm.1,v 1.4 2008/05/02 02:05:08 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt LPRM 1
@@ -77,7 +76,7 @@ is useful only to the super-user.
 .It Ar job\ \&#
 A user may dequeue an individual job by specifying its job number.
 This number may be obtained from the
-.Xr lpq  1
+.Xr lpq 1
 program, e.g.\&
 .Bd -literal -offset indent
 \&% lpq \-l
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 5527b702dd..d18c06fb7a 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -27,7 +27,6 @@
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.16.2.11 2003/03/11 22:31:29 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/mtree/mtree.8,v 1.6 2007/10/20 13:43:00 swildner Exp $
 .\"
 .Dd February 26, 1999
 .Dt MTREE 8
@@ -116,7 +115,7 @@ the specification.
 Don't descend below mount points in the file hierarchy.
 .It Fl f Ar file
 Read the specification from
-.Ar file  ,
+.Ar file ,
 instead of from the standard input.
 .It Fl K Ar keywords
 Add the specified (whitespace or comma separated)
@@ -128,7 +127,7 @@ Use the ``type'' keyword plus the specified (whitespace or comma separated)
 instead of the current set of keywords.
 .It Fl p Ar path
 Use the file hierarchy rooted in
-.Ar path  ,
+.Ar path ,
 instead of the current directory.
 .It Fl s Ar seed
 Display a single checksum to the standard error output that represents all
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index 23a6342234..f30f922161 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -27,7 +27,6 @@
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
 .\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.12.2.5 2003/03/11 22:31:33 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/sliplogin/sliplogin.8,v 1.4 2006/04/17 18:01:38 swildner Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
@@ -116,7 +115,7 @@ with space) are ignored.
 Other lines must start with a
 .Ar loginname
 but the remaining arguments can be whatever is appropriate for the
-.Pa  slip.login
+.Pa slip.login
 file that will be executed for that name.
 Arguments are separated by white space and follow normal
 .Xr sh 1
-- 
2.41.0