43 files changed, 64 insertions, 65 deletions

diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 2c4deaea5599..1ef8c89fd7ed 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -570,7 +570,7 @@ An
 command first appeared in AT&T UNIX Version 1.
 In
 .Fx 8.0 ,
-.An "Kai Wang" Aq kaiw@FreeBSD.org
+.An Kai Wang Aq Mt kaiw@FreeBSD.org
 reimplemented
 .Nm
 and
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index a87697439f76..7dc1529f7e5a 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -330,12 +330,13 @@ job-creation lock file
 .Xr cron 8 ,
 .Xr sendmail 8
 .Sh AUTHORS
+.An -nosplit
 At was mostly written by
-.An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de .
+.An Thomas Koenig Aq Mt ig25@rz.uni-karlsruhe.de .
 The time parsing routines are by
-.An David Parsons Aq orc@pell.chi.il.us ,
+.An David Parsons Aq Mt orc@pell.chi.il.us ,
 with minor enhancements by
-.An Joe Halpin Aq joe.halpin@attbi.com .
+.An Joe Halpin Aq Mt joe.halpin@attbi.com .
 .Sh BUGS
 If the file
 .Pa /var/run/utx.active
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index e4a4abc45ecb..6ee4b08431e0 100644
--- a/usr.bin/bluetooth/bthost/bthost.1
+++ b/usr.bin/bluetooth/bthost/bthost.1
@@ -112,4 +112,4 @@ foo: Unknown Protocol/Service Multiplexor
 .Xr bluetooth.hosts 5 ,
 .Xr bluetooth.protocols 5
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index ad5063da32c7..41bf2a1cce84 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -77,7 +77,7 @@ Display a list of active routing entries (if any) for specified protocol.
 .Sh SEE ALSO
 .Xr ng_btsocket 4
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index 92c7d4545ab3..0f60089061f5 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -181,6 +181,6 @@ can be used to talk to the remote serial port on the server.
 .Xr rfcomm_pppd 8 ,
 .Xr sdpd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Please report if found.
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 467578c15a86..6b8477773c6a 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -101,4 +101,4 @@ manual page first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
 This manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.1 b/usr.bin/bsdiff/bsdiff/bsdiff.1
index f4998ea2b2ba..bca199f3ab90 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.1
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.1
@@ -66,7 +66,7 @@ an absolute minimum working set size of 8 times the size of
 .Sh SEE ALSO
 .Xr bspatch 1
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/bsdiff/bspatch/bspatch.1 b/usr.bin/bsdiff/bspatch/bspatch.1
index 352d0cfa1be6..edbfb198eaed 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.1
+++ b/usr.bin/bsdiff/bspatch/bspatch.1
@@ -62,7 +62,7 @@ of performance.
 .Sh SEE ALSO
 .Xr bsdiff 1
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/cpuset/cpuset.1 b/usr.bin/cpuset/cpuset.1
index 17d9ce9ed26c..8ea2702499f1 100644
--- a/usr.bin/cpuset/cpuset.1
+++ b/usr.bin/cpuset/cpuset.1
@@ -191,4 +191,4 @@ The
 command first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/usr.bin/csup/cpasswd.1 b/usr.bin/csup/cpasswd.1
index 1e5a5c32dda1..8d0ef092301b 100644
--- a/usr.bin/csup/cpasswd.1
+++ b/usr.bin/csup/cpasswd.1
@@ -107,12 +107,12 @@ http://www.cvsup.org/
 .Ed
 .Sh AUTHORS
 .An -nosplit
-.An Petar Zhivkov Petrov Aq pesho.petrov@gmail.com
+.An Petar Zhivkov Petrov Aq Mt pesho.petrov@gmail.com
 is the author of
 .Nm ,
 the rewrite of
 .Nm cvpasswd .
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
 is the author of
 .Nm CVSup .
 .Sh LEGALITIES
diff --git a/usr.bin/csup/csup.1 b/usr.bin/csup/csup.1
index fcf63edb1347..e40204b46505 100644
--- a/usr.bin/csup/csup.1
+++ b/usr.bin/csup/csup.1
@@ -973,13 +973,13 @@ List files.
 .Xr ssh 1 .
 .Sh AUTHORS
 .An -nosplit
-.An Maxime Henrion Aq mux@FreeBSD.org
+.An Maxime Henrion Aq Mt mux@FreeBSD.org
 is the author of
 .Nm ,
 the rewrite of
 .Nm CVSup
 in C.
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
 is the author of
 .Nm CVSup .
 .Sh LEGALITIES
diff --git a/usr.bin/ctlstat/ctlstat.8 b/usr.bin/ctlstat/ctlstat.8
index fef1ff859aeb..22da2bfd2a5a 100644
--- a/usr.bin/ctlstat/ctlstat.8
+++ b/usr.bin/ctlstat/ctlstat.8
@@ -119,5 +119,5 @@ every 10 seconds.
 .Xr ctladm 8 ,
 .Xr iostat 8
 .Sh AUTHORS
-.An Ken Merry Aq ken@FreeBSD.org
-.An Will Andrews Aq will@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org
+.An Will Andrews Aq Mt will@FreeBSD.org
diff --git a/usr.bin/elf2aout/elf2aout.1 b/usr.bin/elf2aout/elf2aout.1
index 0f4be221348d..33c603629868 100644
--- a/usr.bin/elf2aout/elf2aout.1
+++ b/usr.bin/elf2aout/elf2aout.1
@@ -59,6 +59,6 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index 5818297d82e8..dbb3171213ee 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -102,10 +102,10 @@ The
 .Nm
 utility
 was written by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 This
 manual page was written by
-.An David O'Brien Aq obrien@FreeBSD.org .
+.An David O'Brien Aq Mt obrien@FreeBSD.org .
 .Sh BUGS
 Does not fully implement the
 .Tn ELF
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index b9d47855edc4..10df42153c53 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -389,17 +389,17 @@ This implementation first appeared in
 The original implementation of
 .Nm
 was done by
-.An Jean-Marc Zucconi Aq jmz@FreeBSD.org .
+.An Jean-Marc Zucconi Aq Mt jmz@FreeBSD.org .
 It was extensively re-worked for
 .Fx 2.2
 by
-.An Garrett Wollman Aq wollman@FreeBSD.org ,
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org ,
 and later completely rewritten to use the
 .Xr fetch 3
 library by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 and
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Sh NOTES
 The
 .Fl b
diff --git a/usr.bin/fstat/fuser.1 b/usr.bin/fstat/fuser.1
index d13e2b5b0369..7bae409698fa 100644
--- a/usr.bin/fstat/fuser.1
+++ b/usr.bin/fstat/fuser.1
@@ -139,7 +139,7 @@ utility appeared in
 The
 .Nm
 utility and this manual page was written by
-.An Stanislav Sedov Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 .Sh BUGS
 Since
 .Nm
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index c3baed94b1fa..29a2026e5ea1 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -204,4 +204,4 @@ The
 utility first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Garrett A. Wollman Aq wollman@lcs.mit.edu
+.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1
index ca1ca157ebb7..ba78bd060b30 100644
--- a/usr.bin/gzip/gzip.1
+++ b/usr.bin/gzip/gzip.1
@@ -214,9 +214,9 @@ and first appeared in
 This implementation of
 .Nm
 was written by
-.An Matthew R. Green Aq mrg@eterna.com.au
+.An Matthew R. Green Aq Mt mrg@eterna.com.au
 with unpack support written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
 .Sh BUGS
 According to RFC 1952, the recorded file size is stored in a 32-bit
 integer, therefore, it can not represent files larger than 4GB.
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 7d231342d68b..22cf3db79fbd 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -169,7 +169,7 @@ default system name list
 .Sh SEE ALSO
 .Xr ipcrm 1
 .Sh AUTHORS
-.An Thorsten Lockert Aq tholo@sigmasoft.com
+.An Thorsten Lockert Aq Mt tholo@sigmasoft.com
 .Sh BUGS
 This manual page is woefully incomplete, because it does not
 at all attempt to explain the information printed by
diff --git a/usr.bin/iscsictl/iscsictl.8 b/usr.bin/iscsictl/iscsictl.8
index 02f7eca83413..23ebcd8a7edd 100644
--- a/usr.bin/iscsictl/iscsictl.8
+++ b/usr.bin/iscsictl/iscsictl.8
@@ -182,5 +182,5 @@ command appeared in
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.bin/ktrdump/ktrdump.8 b/usr.bin/ktrdump/ktrdump.8
index 9a77bfc3c7e2..697e418479fb 100644
--- a/usr.bin/ktrdump/ktrdump.8
+++ b/usr.bin/ktrdump/ktrdump.8
@@ -86,7 +86,7 @@ utility first appeared in
 The
 .Nm
 utility was implemented by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index b245631fdae0..483825bfdd5a 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -77,4 +77,4 @@ utility first appeared in SunOS 4.0, it appeared in its current form in
 The
 .Fl v
 support is based on code written by
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index be9d9ccc61a6..57119e53768b 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -169,4 +169,4 @@ A
 utility first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1
index 6ac7acc8a5fd..d84284a5e386 100644
--- a/usr.bin/logins/logins.1
+++ b/usr.bin/logins/logins.1
@@ -100,5 +100,5 @@ utility appeared in
 The
 .Nm
 utility was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 based on similar utilities in other operating systems.
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index d0669c127dd6..a32dc62ff1ce 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -500,9 +500,9 @@ Many other
 have dire size limitations with respect to buffer sizes.
 .Sh AUTHORS
 .An -nosplit
-.An Ozan Yigit Aq oz@sis.yorku.ca
+.An Ozan Yigit Aq Mt oz@sis.yorku.ca
 and
-.An Richard A. O'Keefe Aq ok@goanna.cs.rmit.OZ.AU .
+.An Richard A. O'Keefe Aq Mt ok@goanna.cs.rmit.OZ.AU .
 .Pp
 GNU-m4 compatibility extensions by
-.An Marc Espie Aq espie@cvs.openbsd.org .
+.An Marc Espie Aq Mt espie@cvs.openbsd.org .
diff --git a/usr.bin/mkcsmapper/mkcsmapper.1 b/usr.bin/mkcsmapper/mkcsmapper.1
index 650df500b77d..cf1fde233687 100644
--- a/usr.bin/mkcsmapper/mkcsmapper.1
+++ b/usr.bin/mkcsmapper/mkcsmapper.1
@@ -86,4 +86,4 @@ first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/usr.bin/mkesdb/mkesdb.1 b/usr.bin/mkesdb/mkesdb.1
index 66eb3908804d..c5d2edfed720 100644
--- a/usr.bin/mkesdb/mkesdb.1
+++ b/usr.bin/mkesdb/mkesdb.1
@@ -81,4 +81,4 @@ first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/usr.bin/mkulzma/mkulzma.8 b/usr.bin/mkulzma/mkulzma.8
index d61519864e3a..b4ac33fe64ba 100644
--- a/usr.bin/mkulzma/mkulzma.8
+++ b/usr.bin/mkulzma/mkulzma.8
@@ -103,5 +103,5 @@ on the mount point provided as the first argument to the script.
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
-.An Aleksandr Rybalko Aq ray@ddteam.net
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index e6aeb4b15528..c0b8315d891b 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -103,4 +103,4 @@ on the mount point provided as the first argument to the script.
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 3d71ec321776..329db6d7687a 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -189,7 +189,7 @@ command appeared in
 The
 .Nm ncal
 command and manual were written by
-.An Wolfgang Helbig Aq helbig@FreeBSD.org .
+.An Wolfgang Helbig Aq Mt helbig@FreeBSD.org .
 .Sh BUGS
 The assignment of Julian\(enGregorian switching dates to country
 codes is historically naive for many countries.
diff --git a/usr.bin/rctl/rctl.8 b/usr.bin/rctl/rctl.8
index 02bdd0caf936..f7afee99aede 100644
--- a/usr.bin/rctl/rctl.8
+++ b/usr.bin/rctl/rctl.8
@@ -268,7 +268,7 @@ command appeared in
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
 .Sh BUGS
 Limiting
diff --git a/usr.bin/revoke/revoke.1 b/usr.bin/revoke/revoke.1
index 6dd6e2f22f4a..2ab52c38fd48 100644
--- a/usr.bin/revoke/revoke.1
+++ b/usr.bin/revoke/revoke.1
@@ -53,4 +53,4 @@ The
 program first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 277535efdb44..955c2776108a 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -620,7 +620,7 @@ command, written by
 appeared in
 .At v7 .
 .Sh AUTHORS
-.An "Diomidis D. Spinellis" Aq dds@FreeBSD.org
+.An Diomidis D. Spinellis Aq Mt dds@FreeBSD.org
 .Sh BUGS
 Multibyte characters containing a byte with value 0x5C
 .Tn ( ASCII
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 8f744ed135a9..b27a7841b56a 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -160,4 +160,4 @@ command appeared in
 The
 .Nm
 command and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/usr.bin/ssh-copy-id/ssh-copy-id.1 b/usr.bin/ssh-copy-id/ssh-copy-id.1
index f3e01db2c146..5974d03ec98a 100644
--- a/usr.bin/ssh-copy-id/ssh-copy-id.1
+++ b/usr.bin/ssh-copy-id/ssh-copy-id.1
@@ -85,6 +85,6 @@ To send a specific key to multiple hosts:
 The
 .Nm
 utility was written by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org
 as a drop-in replacement for an existing utility included with
 OpenSSH.
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index 0d6f3a2cba32..96e172415e33 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -601,8 +601,6 @@ and
 The
 .Nm
 utility was written by
-.An Andrew Brown
-.Aq atatat@NetBSD.org .
+.An Andrew Brown Aq Mt atatat@NetBSD.org .
 This man page was written by
-.An Jan Schaumann
-.Aq jschauma@NetBSD.org .
+.An Jan Schaumann Aq Mt jschauma@NetBSD.org .
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index 827097ce6c6f..117fe700a432 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -149,5 +149,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Sheldon Hearn
-.Aq sheldonh@starjuice.net .
+.An Sheldon Hearn Aq Mt sheldonh@starjuice.net .
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index d362eaf197e4..f09a2448a05f 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -415,9 +415,10 @@ command appeared in
 support was added in
 .Fx 4.7 .
 .Sh AUTHORS
+.An -nosplit
 The original implementation was written by
-.An Dave Yost Aq Dave@Yost.com .
-.An Tony Finch Aq dot@dotat.at
+.An Dave Yost Aq Mt Dave@Yost.com .
+.An Tony Finch Aq Mt dot@dotat.at
 rewrote it to support
 .Tn ANSI\~C .
 .Sh BUGS
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 83f2d9ed094f..dff0f5859038 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -170,7 +170,7 @@ units.
 the standard units library
 .El
 .Sh AUTHORS
-.An Adrian Mariano Aq adrian@cam.cornell.edu
+.An Adrian Mariano Aq Mt adrian@cam.cornell.edu
 .Sh BUGS
 The effect of including a '/' in a prefix is surprising.
 .Pp
diff --git a/usr.bin/unzip/unzip.1 b/usr.bin/unzip/unzip.1
index 0c540515de8a..fd9b10fa6555 100644
--- a/usr.bin/unzip/unzip.1
+++ b/usr.bin/unzip/unzip.1
@@ -182,8 +182,8 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 It uses the
 .Xr archive 3
 library developed by
-.An Tim Kientzle Aq kientzle@FreeBSD.org .
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org .
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 52e010adb0a4..0c0dce82e769 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -78,8 +78,8 @@ command first appeared in
 The
 .Nm
 utility was originally written in Perl and was contributed by
-.An Wolfram Schneider Aq wosch@FreeBSD.org .
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org .
 The current version of
 .Nm
 was rewritten in C by
-.An Daniel Papasian Aq dpapasia@andrew.cmu.edu .
+.An Daniel Papasian Aq Mt dpapasia@andrew.cmu.edu .
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 8a2565200354..7106383ce4ef 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -71,4 +71,4 @@ Display the map nickname table.
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo De Raadt Aq deraadt@theos.com .
+.An Theo De Raadt Aq Mt deraadt@theos.com .
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 5f4a4cab278d..4291de24fa0b 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -72,4 +72,4 @@ Display the map nickname table.
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo De Raadt Aq deraadt@theos.com .
+.An Theo De Raadt Aq Mt deraadt@theos.com .