use .Mt to mark up email addresses consistently (part2)

PR:		191174
Submitted by:	Franco Fichtner  <franco@lastsummer.de>

libexec/bootpd/bootpd.8

@@ -279,7 +279,7 @@ DHCP Options and BOOTP Vendor Extensions
 .El
 .Sh AUTHORS
 This distribution is currently maintained by
-.An Walter L. Wimer Aq walt+@cmu.edu .
+.An Walter L. Wimer Aq Mt walt+@cmu.edu .
 .Pp
 The original BOOTP server was created by
 .An Bill Croft
@@ -299,12 +299,12 @@ Enhancements and bug-fixes have been contributed by:
 (in alphabetical order)
 .Pp
 .An -split
-.An Danny Backx Aq db@sunbim.be
+.An Danny Backx Aq Mt db@sunbim.be
-.An John Brezak Aq brezak@ch.hp.com
+.An John Brezak Aq Mt brezak@ch.hp.com
-.An Frank da Cruz Aq fdc@cc.columbia.edu
+.An Frank da Cruz Aq Mt fdc@cc.columbia.edu
-.An David R. Linn Aq drl@vuse.vanderbilt.edu
+.An David R. Linn Aq Mt drl@vuse.vanderbilt.edu
-.An Jim McKim Aq mckim@lerc.nasa.gov
+.An Jim McKim Aq Mt mckim@lerc.nasa.gov
-.An Gordon W. Ross Aq gwr@mc.com
+.An Gordon W. Ross Aq Mt gwr@mc.com
-.An Jason Zions Aq jazz@hal.com .
+.An Jason Zions Aq Mt jazz@hal.com .
 .Sh BUGS
 Individual host entries must not exceed 1024 characters.

libexec/bootpd/tools/bootptest/bootptest.8

@@ -62,7 +62,7 @@ utility is a combination of original and derived works.
 The main program module
 .Pq Pa bootptest.c
 is original work by
-.An "Gordon W. Ross" Aq gwr@mc.com .
+.An Gordon W. Ross Aq Mt gwr@mc.com .
 The packet printing module
 .Pq Pa print\-bootp.c
 is a slightly modified

libexec/mknetid/mknetid.8

@@ -149,4 +149,4 @@ the default netid database file
 .Xr yp 8 ,
 .Xr yp_mkdb 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu

libexec/mknetid/netid.5

@@ -88,4 +88,4 @@ unix.jodie@kaka 0:jodie
 .Xr mknetid 8 ,
 .Xr yp 8
 .Sh AUTHORS
-.An Mats O Jansson Aq moj@stacken.kth.se
+.An Mats O Jansson Aq Mt moj@stacken.kth.se

libexec/pppoed/pppoed.8

@@ -206,7 +206,7 @@ and the following to
 The
 .Nm
 utility was written by
-.An Brian Somers Aq brian@Awfulhak.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
 and first appeared in
 .Fx 3.4 .
 .Sh BUGS

libexec/revnetgroup/revnetgroup.8

@@ -156,4 +156,4 @@ master server
 .Xr yp 8 ,
 .Xr yp_mkdb 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu

libexec/ypxfr/ypxfr.8

@@ -305,4 +305,4 @@ domain.
 .Xr yppush 8 ,
 .Xr ypserv 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu

usr.sbin/acpi/acpiconf/acpiconf.8

@@ -91,6 +91,6 @@ utility appeared in
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org .
+.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .

usr.sbin/acpi/acpidb/acpidb.8

@@ -161,7 +161,7 @@ It was imported for
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org
+.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org
 and uses Intel ACPI-CA for the backend.
 This manual page was written by
 .An Nate Lawson .

usr.sbin/acpi/acpidump/acpidump.8

@@ -181,20 +181,20 @@ and was rewritten to use
 for
 .Fx 5.2 .
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
-.An Yasuo YOKOYAMA Aq yokoyama@jp.FreeBSD.org
+.An Yasuo YOKOYAMA Aq Mt yokoyama@jp.FreeBSD.org
-.An Nate Lawson Aq njl@FreeBSD.org
+.An Nate Lawson Aq Mt njl@FreeBSD.org
 .Pp
 .An -nosplit
 Some contributions made by
-.An Chitoshi Ohsawa Aq ohsawa@catv1.ccn-net.ne.jp ,
+.An Chitoshi Ohsawa Aq Mt ohsawa@catv1.ccn-net.ne.jp ,
-.An Takayasu IWANASHI Aq takayasu@wendy.a.perfect-liberty.or.jp ,
+.An Takayasu IWANASHI Aq Mt takayasu@wendy.a.perfect-liberty.or.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
-.An Hiroki Sato Aq hrs@FreeBSD.org ,
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org ,
-.An Michael Lucas Aq mwlucas@blackhelicopters.org
+.An Michael Lucas Aq Mt mwlucas@blackhelicopters.org
 and
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The current implementation does not dump the BOOT structure or
 other miscellaneous tables.

usr.sbin/adduser/adduser.8

@@ -450,11 +450,11 @@ command appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page and the original script, in Perl, was written by
-.An Wolfram Schneider Aq wosch@FreeBSD.org .
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org .
 The replacement script, written as a Bourne
 shell script with some enhancements, and the man page modification that
 came with it were done by
-.An Mike Makonnen Aq mtm@identd.net .
+.An Mike Makonnen Aq Mt mtm@identd.net .
 .Sh BUGS
 In order for
 .Nm

usr.sbin/adduser/adduser.conf.5

@@ -210,7 +210,7 @@ manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 The internal variables documented here may change without notice.
 Do not rely on them.

usr.sbin/ancontrol/ancontrol.8

@@ -540,7 +540,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
 and received frames as increasing.

usr.sbin/apm/apm.8

@@ -133,7 +133,7 @@ replaces all of its functionality.
 .Xr apm 4 ,
 .Xr zzz 8
 .Sh AUTHORS
-.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
+.An Tatsumi Hosokawa Aq Mt hosokawa@jp.FreeBSD.org
 .Sh BUGS
 Some APM implementations do not support parameters needed by
 .Nm .

usr.sbin/apmd/apmd.8

@@ -308,15 +308,15 @@ The
 utility appeared in
 .Fx 3.3 .
 .Sh AUTHORS
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
-.An KOIE Hidetaka Aq koie@suri.co.jp
+.An KOIE Hidetaka Aq Mt koie@suri.co.jp
 .Pp
 .An -nosplit
 Some contributions made by
-.An Warner Losh Aq imp@FreeBSD.org ,
+.An Warner Losh Aq Mt imp@FreeBSD.org ,
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp ,
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
-.An Norihiro Kumagai Aq kuma@nk.rim.or.jp ,
+.An Norihiro Kumagai Aq Mt kuma@nk.rim.or.jp ,
-.An NAKAGAWA Yoshihisa Aq nakagawa@jp.FreeBSD.org ,
+.An NAKAGAWA Yoshihisa Aq Mt nakagawa@jp.FreeBSD.org ,
 and
-.An Nick Hilliard Aq nick@foobar.org .
+.An Nick Hilliard Aq Mt nick@foobar.org .

usr.sbin/asf/asf.8

@@ -170,7 +170,7 @@ The
 utility first appeared in
 .Fx 5.2 .
 .Sh AUTHORS
-.An Greg Lehey Aq grog@FreeBSD.org
+.An Greg Lehey Aq Mt grog@FreeBSD.org
 .Sh BUGS
 Module paths are guessed in a rather naive way by default.
 It is likely to lag behind the changes to the build tree layout.

usr.sbin/bhyve/bhyve.8

@@ -303,5 +303,5 @@ bhyve -c 4 \e\
 first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Neel Natu Aq neel@freebsd.org
+.An Neel Natu Aq Mt neel@freebsd.org
-.An Peter Grehan Aq grehan@freebsd.org
+.An Peter Grehan Aq Mt grehan@freebsd.org

usr.sbin/bhyveload/bhyveload.8

@@ -147,9 +147,9 @@ and was developed at NetApp Inc.
 .Nm
 was developed by
 .An -nosplit
-.An "Neel Natu" Aq neel@FreeBSD.org
+.An Neel Natu Aq Mt neel@FreeBSD.org
 at NetApp Inc with a lot of help from
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 .Sh BUGS
 .Nm
 can only load

usr.sbin/bluetooth/ath3kfw/ath3kfw.8

@@ -72,7 +72,7 @@ Display usage message and exit.
 .Xr ugen 4 ,
 .Xr devd 8
 .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.

usr.sbin/bluetooth/bcmfw/bcmfw.8

@@ -99,7 +99,7 @@ device:
 .Xr ubtbcmfw 4 ,
 .Xr ugen 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.

usr.sbin/bluetooth/bt3cfw/bt3cfw.8

@@ -68,6 +68,6 @@ Connect to the specified Netgraph driver node of type
 .Sh SEE ALSO
 .Xr ng_bt3c 4
 .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.

usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8

@@ -99,4 +99,4 @@ are:
 .Sh SEE ALSO
 .Xr bthidd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com

usr.sbin/bluetooth/bthidd/bthidd.8

@@ -107,7 +107,7 @@ configuration file is needed as well.
 .Xr vkbd 4 ,
 .Xr bthidcontrol 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 Any Bluetooth HID device that has
 .Dv HUP_KEYBOARD

usr.sbin/bluetooth/hccontrol/hccontrol.8

@@ -178,7 +178,7 @@ are:
 .Xr ng_hci 4 ,
 .Xr hcseriald 8
 .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.

usr.sbin/bluetooth/hcsecd/hcsecd.8

@@ -120,7 +120,7 @@ Display usage message and exit.
 .Xr hccontrol 8 ,
 .Xr hcseriald 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Currently there is no way to select the link key or the PIN code based on
 which local device received the request.

usr.sbin/bluetooth/hcsecd/hcsecd.conf.5

@@ -128,4 +128,4 @@ device {
 .Sh SEE ALSO
 .Xr hcsecd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com

usr.sbin/bluetooth/hcseriald/hcseriald.8

@@ -83,4 +83,4 @@ is an H4 Netgraph node name.
 .Xr tty 4 ,
 .Xr hccontrol 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com

usr.sbin/bluetooth/l2control/l2control.8

@@ -94,4 +94,4 @@ are:
 .Xr ng_l2cap 4 ,
 .Xr l2ping 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq emax@FreeBSD.org
+.An Maksim Yevmenkin Aq Mt emax@FreeBSD.org

usr.sbin/bluetooth/l2ping/l2ping.8

@@ -108,7 +108,7 @@ Some implementations may not like large sizes and may hang or even crash.
 .Xr ng_l2cap 4 ,
 .Xr l2control 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq emax@FreeBSD.org
+.An Maksim Yevmenkin Aq Mt emax@FreeBSD.org
 .Sh BUGS
 Could collect more statistic.
 Could check for duplicated, corrupted and lost packets.

usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8

@@ -343,7 +343,7 @@ label.
 .Xr sdpcontrol 8 ,
 .Xr sdpd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm

usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8

@@ -96,7 +96,7 @@ are:
 .Xr bluetooth 3 ,
 .Xr sdp 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm

usr.sbin/bluetooth/sdpd/sdpd.8

@@ -134,7 +134,7 @@ as RFCOMM channels etc., before registering the service.
 .Xr sdp 3 ,
 .Xr sdpcontrol 8
 .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.

usr.sbin/boot0cfg/boot0cfg.8

@@ -190,7 +190,7 @@ to install the default MBR:
 .Xr fdisk 8 ,
 .Xr gpart 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
 .Sh BUGS
 Use of the
 .Sq packet

usr.sbin/bootparamd/bootparamd/bootparamd.8

@@ -69,7 +69,7 @@ The alias address must of course be free for use.
 .Xr diskless 8
 .Sh AUTHORS
 Written by
-.An Klas Heggemann Aq klas@nada.kth.se .
+.An Klas Heggemann Aq Mt klas@nada.kth.se .
 .Sh BUGS
 You may find the
 .Xr syslog 3

usr.sbin/bsdconfig/bsdconfig.8

@@ -236,7 +236,7 @@ first appeared in
 .Fx 9.2 .
 .Sh AUTHORS
 .An Ron McDowell
-.An Devin Teske Aq dteske@FreeBSD.org
+.An Devin Teske Aq Mt dteske@FreeBSD.org
 .Sh BUGS
 The docsinstall and diskmgmt modules call bsdinstall.
 Bugs found in these modules should be considered those of bsdinstall, not

usr.sbin/bsdinstall/bsdinstall.8

@@ -367,5 +367,4 @@ This version of
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An -nosplit
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org

usr.sbin/bsdinstall/partedit/sade.8

@@ -64,12 +64,11 @@ installer. It was replaced in
 with the equivalent part of
 .Xr bsdinstall 8 .
 .Sh AUTHORS
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 .Sh BUGS
 The utility misses a lot of nice features, such as tools for
 manipulating
 .Xr gmirror 8
 or
-.Xr zfs 8
+.Xr zfs 8 .
-.
 These will be added later.

usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3

@@ -116,4 +116,4 @@ This is the private BEGEMOT-BRIDGE-MIB that is implemented by this module.
 .Xr ifconfig 8 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org

usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3

@@ -67,4 +67,4 @@ configuration file.
 .Xr hastctl 8 ,
 .Xr hastd 8
 .Sh AUTHORS
-.An Mikolaj Golub Aq trociny@FreeBSD.org
+.An Mikolaj Golub Aq Mt trociny@FreeBSD.org

usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3

@@ -85,4 +85,4 @@ This is the MIB that is implemented by this module.
 .Xr gensnmptree 1 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Victor Cruceru Aq soc-victor@FreeBSD.org
+.An Victor Cruceru Aq Mt soc-victor@FreeBSD.org

usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3

@@ -57,4 +57,4 @@ The private BEGEMOT-LM75-MIB that is implemented by this module.
 .Xr snmpmod 3 ,
 .Xr lm75 4
 .Sh AUTHORS
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org

usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3

@@ -433,4 +433,4 @@ This is the MIB that is implemented by this module.
 .Xr gensnmptree 1 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
+.An Hartmut Brandt Aq Mt harti@FreeBSD.org

usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3

@@ -157,4 +157,4 @@ The private BEGEMOT-WIRELESS-MIB that is implemented by this module.
 .Xr ifconfig 8 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org

usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1

@@ -430,4 +430,4 @@ SNMPv3 is the default version to use for outgoing requests.
 .Sh SEE ALSO
 .Xr gensnmpdef 1
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org

usr.sbin/btxld/btxld.8

@@ -95,4 +95,4 @@ combined .text and .data segments of the client image.
 .Xr ld 1 ,
 .Xr boot 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org

usr.sbin/chkgrp/chkgrp.8

@@ -86,8 +86,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 .
 Further functionality was added by
-.An Liam J. Foy Aq liamfoy@dragonflybsd.org .
+.An Liam J. Foy Aq Mt liamfoy@dragonflybsd.org .
 .Sh BUGS
 Should check the range of the group ID.

usr.sbin/cpucontrol/cpucontrol.8

@@ -177,6 +177,6 @@ utility first 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
 Yes, probably, report if any.

usr.sbin/cron/cron/cron.8

@@ -218,4 +218,4 @@ Directory for personal crontab files
 .Xr crontab 5 ,
 .Xr pam.conf 5
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com

usr.sbin/cron/crontab/crontab.1

@@ -142,4 +142,4 @@ The new command syntax
 differs from previous versions of Vixie Cron, as well as from the classic
 SVR3 syntax.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com

usr.sbin/cron/crontab/crontab.5

@@ -295,7 +295,7 @@ All of the
 commands that can appear in place of the first five fields
 are extensions.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
 .Sh BUGS
 If you are in one of the 70-odd countries that observe Daylight
 Savings Time, jobs scheduled during the rollback or advance may be

usr.sbin/crunch/crunchgen/crunchgen.1

@@ -444,7 +444,7 @@ would also need to be copied to the install floppy.
 The
 .Nm
 utility was written by
-.An James da Silva Aq jds@cs.umd.edu .
+.An James da Silva Aq Mt jds@cs.umd.edu .
 .Pp
 Copyright (c) 1994 University of Maryland.
 All Rights Reserved.
@@ -452,9 +452,9 @@ All Rights Reserved.
 The
 .Ic libs_so
 keyword was added in 2005 by
-.An Adrian Steinmann Aq ast@marabu.ch
+.An Adrian Steinmann Aq Mt ast@marabu.ch
 and
-.An Ceri Davies Aq ceri@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org .
 .Sh CAVEATS
 While
 .Nm

usr.sbin/crunch/crunchide/crunchide.1

@@ -76,12 +76,12 @@ multiple component programs.
 The
 .Nm crunch
 utility was written by
-.An James da Silva Aq jds@cs.umd.edu .
+.An James da Silva Aq Mt jds@cs.umd.edu .
 .Pp
 Copyright (c) 1994 University of Maryland.
 All Rights Reserved.
 .Pp
-.An Chris Demetriou Aq cgd@netbsd.org
+.An Chris Demetriou Aq Mt cgd@netbsd.org
 reorganized
 .Nm
 so that it supported multiple object formats, and added

usr.sbin/ctladm/ctladm.8

@@ -1053,4 +1053,4 @@ The
 utility was originally written during the Winter/Spring of 2003 as an
 interface to CTL.
 .Sh AUTHORS
-.An Ken Merry Aq ken@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org

usr.sbin/ctld/ctl.conf.5

@@ -283,5 +283,5 @@ The
 configuration file functionality for
 .Xr ctld 8
 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.

usr.sbin/ctld/ctld.8

@@ -109,5 +109,5 @@ utility exits 0 on success, and >0 if an error occurs.
 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.

usr.sbin/ctm/ctm/ctm.1

@@ -316,10 +316,9 @@ The
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
-.Aq phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
-.Aq joerg@FreeBSD.org
 wrote this man-page.

usr.sbin/ctm/ctm/ctm.5

@@ -174,10 +174,9 @@ methods were hashed out.
 The CTM system has been made publicly available in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
-.Aq phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
-.Aq joerg@FreeBSD.org
 wrote this man-page.

usr.sbin/ctm/ctm_rmail/ctm_rmail.1

@@ -507,4 +507,4 @@ Error messages should be self explanatory.
 .Xr ctm 5
 .\" .Sh HISTORY
 .Sh AUTHORS
-.An Stephen McKay Aq mckay@FreeBSD.org
+.An Stephen McKay Aq Mt mckay@FreeBSD.org

usr.sbin/dconschat/dconschat.8

@@ -323,7 +323,7 @@ console remote {
 .Xr eui64 5 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This utility is
 .Ud

usr.sbin/devinfo/devinfo.8

@@ -73,4 +73,4 @@ Without this flag, only those devices that have attached are reported.
 .Xr devclass 9 ,
 .Xr device 9
 .Sh AUTHORS
-.An Mike Smith Aq msmith@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org

usr.sbin/dumpcis/dumpcis.8

@@ -44,6 +44,5 @@ utility translates a raw CIS stream into human readable form.
 .Xr cbb 4 ,
 .Xr pccard 4
 .Sh AUTHORS
-.An -nosplit
 The original version was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .

usr.sbin/eeprom/eeprom.8

@@ -684,15 +684,15 @@ The
 utility uses base code from the
 .Nx
 version written by
-.An "Jason R. Thorpe" .
+.An Jason R. Thorpe .
 The handlers for the Open Firmware
 .Pa /options
 node were written by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 The code for accessing the Open Firmware device tree is shared with the
 .Xr ofwdump 8
 utility written by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
 .Sh BUGS
 Currently,
 .Nm

usr.sbin/etcupdate/etcupdate.8

@@ -801,7 +801,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An John Baldwin Aq jhb@FreeBSD.org .
+.An John Baldwin Aq Mt jhb@FreeBSD.org .
 .Sh BUGS
 Rerunning a merge does not automatically delete conflicts left over from a
 previous merge.

usr.sbin/fdwrite/fdwrite.1

@@ -104,7 +104,7 @@ Some of the code was taken from
 .Xr fdformat 1 .
 .Sh AUTHORS
 The program has been contributed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Sh BUGS
 Diagnostics are less than complete at present.
 .Pp

usr.sbin/flowctl/flowctl.8

@@ -83,8 +83,8 @@ parameter can be specify to show selected flows in human-readable format.
 The
 .Nm
 utility was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org ,
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org ,
 based on
 .Nm ipacctctl
 written by
-.An Roman V. Palagin Aq romanp@unshadow.net .
+.An Roman V. Palagin Aq Mt romanp@unshadow.net .

usr.sbin/freebsd-update/freebsd-update.8

@@ -174,4 +174,4 @@ stores temporary files and downloaded updates.
 .Sh SEE ALSO
 .Xr freebsd-update.conf 5
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org

usr.sbin/fwcontrol/fwcontrol.8

@@ -211,9 +211,9 @@ The
 utility first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
-.An Petr Holub Aq hopet@ics.muni.cz
+.An Petr Holub Aq Mt hopet@ics.muni.cz
-- MPEG TS mode.
+(MPEG TS mode)
 .Sh BUGS
 This utility is still under development and provided for debugging purposes.
 Especially MPEG TS reception support is very rudimental and supports only

usr.sbin/gpioctl/gpioctl.8

@@ -121,5 +121,4 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Oleksandr Tymoshenko
+.An Oleksandr Tymoshenko Aq Mt gonzo@freebsd.org .
-.Aq gonzo@freebsd.org

usr.sbin/gssd/gssd.8

@@ -116,4 +116,4 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .

usr.sbin/i2c/i2c.8

@@ -159,8 +159,6 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Bartlomiej Sieka
+.An Bartlomiej Sieka Aq Mt tur@semihalf.com
-.Aq tur@semihalf.com
 and
-.An Michal Hajduk
+.An Michal Hajduk Aq Mt mih@semihalf.com .
-.Aq mih@semihalf.com .

usr.sbin/iostat/iostat.8

@@ -506,7 +506,7 @@ This version of
 first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 The use of
 .Nm

usr.sbin/ipfwpcap/ipfwpcap.8

@@ -127,6 +127,6 @@ utility first appeared in
 .An -nosplit
 .Nm
 was written by
-.An P. Kern Aq pkern@cns.utoronto.ca .
+.An P. Kern Aq Mt pkern@cns.utoronto.ca .
 This manual page was written by
-.An Niclas Zeising Aq zeising@FreeBSD.org .
+.An Niclas Zeising Aq Mt zeising@FreeBSD.org .

usr.sbin/iscsid/iscsid.8

@@ -109,5 +109,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.

usr.sbin/kbdcontrol/kbdcontrol.1

@@ -271,6 +271,6 @@ kbdcontrol -k /dev/kbdmux0 < /dev/console
 .Xr kbdmap 5 ,
 .Xr rc.conf 5
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 .Sh BUGS
 Report when found.

usr.sbin/kbdmap/kbdmap.1

@@ -131,12 +131,10 @@ commands appeared in
 .Fx 2.1 .
 .Sh AUTHORS
 .An -nosplit
-.An Wolfram Schneider
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org
-.Aq wosch@FreeBSD.org
 wrote the original Perl version.
 The current version was rewritten in C by
-.An Jonathan Belson
+.An Jonathan Belson Aq Mt jon@witchspace.com
-.Aq jon@witchspace.com
 for
 .Fx 5.0 .
 .Sh BUGS

usr.sbin/kgzip/kgzip.8

@@ -132,7 +132,7 @@ The default loader
 .Xr boot 8 ,
 .Xr loader 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
 .Sh BUGS
 As symbols are lost, the usefulness of this utility for compressing
 kernels is limited to situations where

usr.sbin/kldxref/kldxref.8

@@ -88,8 +88,8 @@ utility first appeared in
 The
 .Nm
 utility was implemented by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org
+.An Boris Popov Aq Mt bp@FreeBSD.org
 and
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .

usr.sbin/lmcconfig/lmcconfig.8

@@ -718,6 +718,6 @@ the user is not privileged and tried to alter an interface's configuration.
 This is a total rewrite of the program
 .Nm lmcctl
 by
-.An "Andrew Stanley-Jones" .
+.An Andrew Stanley-Jones .
 .Sh AUTHORS
-.An "David Boggs" Aq boggs@boggs.palo-alto.ca.us
+.An David Boggs Aq Mt boggs@boggs.palo-alto.ca.us

usr.sbin/lpr/chkprintcap/chkprintcap.8

@@ -88,7 +88,7 @@ capability in the database (default 1, which corresponds to user
 The
 .Nm
 utility was written by
-.An Garrett A. Wollman Aq wollman@lcs.mit.edu .
+.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu .
 .Sh BUGS
 Not enough sanity-checking is done.
 At a minimum, the ownership and

usr.sbin/mailwrapper/mailwrapper.8

@@ -153,7 +153,7 @@ utility first appeared in
 and then
 .Fx 4.0 .
 .Sh AUTHORS
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 .Sh BUGS
 The entire reason this program exists is a crock.
 Instead, a command

usr.sbin/makefs/makefs.8

@@ -363,12 +363,11 @@ The
 utility appeared in
 .Nx 1.6 .
 .Sh AUTHORS
-.An Luke Mewburn
+.An Luke Mewburn Aq Mt lukem@NetBSD.org
-.Aq lukem@NetBSD.org
 (original program)
-.An Daniel Watt ,
+.An Daniel Watt
-.An Walter Deignan ,
+.An Walter Deignan
-.An Ryan Gabrys ,
+.An Ryan Gabrys
-.An Alan Perez-Rathke ,
+.An Alan Perez-Rathke
 .An Ram Vedam
 (cd9660 support)

usr.sbin/mergemaster/mergemaster.8

@@ -473,4 +473,4 @@ temporary root environment comes from Nik Clayton's
 make world tutorial which is referenced above.
 .Sh AUTHORS
 This manual page and the script itself were written by
-.An Douglas Barton Aq dougb@FreeBSD.org .
+.An Douglas Barton Aq Mt dougb@FreeBSD.org .

usr.sbin/mixer/mixer.8

@@ -171,11 +171,11 @@ utility first appeared in
 .Sh AUTHORS
 .An -nosplit
 Original source by
-.An Craig Metz Aq cmetz@thor.tjhsst.edu
+.An Craig Metz Aq Mt cmetz@thor.tjhsst.edu
 and
 .An Hannu Savolainen .
 Mostly rewritten by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .

usr.sbin/mlxcontrol/mlxcontrol.8

@@ -136,9 +136,10 @@ Print usage information for
 .Ar command .
 .El
 .Sh AUTHORS
-The mlxcontrol utility was written by
+The
-.An Michael Smith
+.Nm
-.Aq msmith@FreeBSD.org .
+utility was written by
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The
 .Ar config

usr.sbin/moused/moused.8

@@ -819,11 +819,11 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 This manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 The command and manual page have since been updated by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 .Sh CAVEATS
 Many pad devices behave as if the first (left) button were pressed if
 the user

usr.sbin/mptable/mptable.1

@@ -66,4 +66,4 @@ The
 command first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.org
+.An Steve Passe Aq Mt fsmp@FreeBSD.org

usr.sbin/nandsim/nandsim.8

@@ -224,6 +224,6 @@ The
 .Nm
 utility first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 This utility was written by
 .An Lukasz Wojcik .

usr.sbin/ndiscvt/ndiscvt.8

@@ -273,11 +273,11 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
 The
 .Xr lex 1
 and
 .Xr yacc 1
 .Pa INF
 file parser was written by
-.An Matthew Dodd Aq mdodd@FreeBSD.org .
+.An Matthew Dodd Aq Mt mdodd@FreeBSD.org .

usr.sbin/ndiscvt/ndisgen.8

@@ -83,4 +83,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .

usr.sbin/ngctl/ngctl.8

@@ -138,4 +138,4 @@ a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com

usr.sbin/nghook/nghook.8

@@ -135,7 +135,7 @@ in a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com
 .Sh BUGS
 Although all input is read in unbuffered mode,
 there is no way to control the packetization of the input.

usr.sbin/nscd/nscd.8

@@ -159,7 +159,7 @@ The default configuration file.
 .Xr nscd.conf 5 ,
 .Xr nsswitch.conf 5
 .Sh AUTHORS
-.An Michael Bushkov Aq bushman@FreeBSD.org
+.An Michael Bushkov Aq Mt bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@FreeBSD.org .
+.Aq Mt bushman@FreeBSD.org .

usr.sbin/nscd/nscd.conf.5

@@ -152,8 +152,7 @@ symbol at the beginning of the line for comments.
 .Sh SEE ALSO
 .Xr nscd 8
 .Sh AUTHORS
-.An Michael Bushkov
+.An Michael Bushkov Aq Mt bushman@FreeBSD.org
-.Aq bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@FreeBSD.org .
+.Aq Mt bushman@FreeBSD.org .

usr.sbin/nvram/nvram.8

@@ -110,7 +110,7 @@ Darwin/Mac OS X
 .Nm
 utility.
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
 .Sh BUGS
 Currently,
 .Nm

usr.sbin/ofwdump/ofwdump.8

@@ -104,4 +104,4 @@ The
 .Nm
 utility
 was written by
-.An Thomas Moestl Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .

usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8

@@ -112,7 +112,7 @@ This version of
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Kris Moore Aq kmoore@FreeBSD.org
+.An Kris Moore Aq Mt kmoore@FreeBSD.org
 .Sh BUGS
 This utility was written to install PC-BSD and has seen limited use as an
 installer for FreeBSD.  It's likely that usage to install FreeBSD will expose

usr.sbin/periodic/periodic.8

@@ -245,8 +245,8 @@ The
 utility first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Paul Traina Aq pst@FreeBSD.org
+.An Paul Traina Aq Mt pst@FreeBSD.org
-.An Brian Somers Aq brian@Awfulhak.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
 .Sh BUGS
 Since one specifies information about a directory using shell
 variables containing the string,

usr.sbin/pmcannotate/pmcannotate.8

@@ -106,4 +106,4 @@ of interest.
 .Xr objdump 1 ,
 .Xr pmcstat 8
 .Sh AUTHORS
-.An Attilio Rao Aq attilio@FreeBSD.org
+.An Attilio Rao Aq Mt attilio@FreeBSD.org

usr.sbin/pmccontrol/pmccontrol.8

@@ -124,4 +124,4 @@ The
 utility first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Joseph Koshy Aq jkoshy@FreeBSD.org
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org

usr.sbin/pmcstat/pmcstat.8

@@ -471,7 +471,7 @@ utility first appeared in
 It is
 .Ud
 .Sh AUTHORS
-.An Joseph Koshy Aq jkoshy@FreeBSD.org
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org
 .Sh BUGS
 The
 .Nm