aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libexec/bootpd/bootpd.816
-rw-r--r--libexec/bootpd/tools/bootptest/bootptest.82
-rw-r--r--libexec/mknetid/mknetid.82
-rw-r--r--libexec/mknetid/netid.52
-rw-r--r--libexec/pppoed/pppoed.82
-rw-r--r--libexec/revnetgroup/revnetgroup.82
-rw-r--r--libexec/ypxfr/ypxfr.82
-rw-r--r--usr.sbin/acpi/acpiconf/acpiconf.84
-rw-r--r--usr.sbin/acpi/acpidb/acpidb.82
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.820
-rw-r--r--usr.sbin/adduser/adduser.84
-rw-r--r--usr.sbin/adduser/adduser.conf.52
-rw-r--r--usr.sbin/ancontrol/ancontrol.82
-rw-r--r--usr.sbin/apm/apm.82
-rw-r--r--usr.sbin/apmd/apmd.816
-rw-r--r--usr.sbin/asf/asf.82
-rw-r--r--usr.sbin/bhyve/bhyve.84
-rw-r--r--usr.sbin/bhyveload/bhyveload.84
-rw-r--r--usr.sbin/bluetooth/ath3kfw/ath3kfw.82
-rw-r--r--usr.sbin/bluetooth/bcmfw/bcmfw.82
-rw-r--r--usr.sbin/bluetooth/bt3cfw/bt3cfw.82
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.82
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.82
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.82
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.82
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.conf.52
-rw-r--r--usr.sbin/bluetooth/hcseriald/hcseriald.82
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.82
-rw-r--r--usr.sbin/bluetooth/l2ping/l2ping.82
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.82
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.82
-rw-r--r--usr.sbin/bluetooth/sdpd/sdpd.82
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.82
-rw-r--r--usr.sbin/bootparamd/bootparamd/bootparamd.82
-rw-r--r--usr.sbin/bsdconfig/bsdconfig.82
-rw-r--r--usr.sbin/bsdinstall/bsdinstall.83
-rw-r--r--usr.sbin/bsdinstall/partedit/sade.85
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.32
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.32
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.32
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.32
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.32
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.32
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.12
-rw-r--r--usr.sbin/btxld/btxld.82
-rw-r--r--usr.sbin/chkgrp/chkgrp.84
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.82
-rw-r--r--usr.sbin/cron/cron/cron.82
-rw-r--r--usr.sbin/cron/crontab/crontab.12
-rw-r--r--usr.sbin/cron/crontab/crontab.52
-rw-r--r--usr.sbin/crunch/crunchgen/crunchgen.16
-rw-r--r--usr.sbin/crunch/crunchide/crunchide.14
-rw-r--r--usr.sbin/ctladm/ctladm.82
-rw-r--r--usr.sbin/ctld/ctl.conf.52
-rw-r--r--usr.sbin/ctld/ctld.82
-rw-r--r--usr.sbin/ctm/ctm/ctm.17
-rw-r--r--usr.sbin/ctm/ctm/ctm.57
-rw-r--r--usr.sbin/ctm/ctm_rmail/ctm_rmail.12
-rw-r--r--usr.sbin/dconschat/dconschat.82
-rw-r--r--usr.sbin/devinfo/devinfo.82
-rw-r--r--usr.sbin/dumpcis/dumpcis.83
-rw-r--r--usr.sbin/eeprom/eeprom.86
-rw-r--r--usr.sbin/etcupdate/etcupdate.82
-rw-r--r--usr.sbin/fdwrite/fdwrite.12
-rw-r--r--usr.sbin/flowctl/flowctl.84
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.82
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.86
-rw-r--r--usr.sbin/gpioctl/gpioctl.83
-rw-r--r--usr.sbin/gssd/gssd.82
-rw-r--r--usr.sbin/i2c/i2c.86
-rw-r--r--usr.sbin/iostat/iostat.82
-rw-r--r--usr.sbin/ipfwpcap/ipfwpcap.84
-rw-r--r--usr.sbin/iscsid/iscsid.82
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.12
-rw-r--r--usr.sbin/kbdmap/kbdmap.16
-rw-r--r--usr.sbin/kgzip/kgzip.82
-rw-r--r--usr.sbin/kldxref/kldxref.86
-rw-r--r--usr.sbin/lmcconfig/lmcconfig.84
-rw-r--r--usr.sbin/lpr/chkprintcap/chkprintcap.82
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.82
-rw-r--r--usr.sbin/makefs/makefs.811
-rw-r--r--usr.sbin/mergemaster/mergemaster.82
-rw-r--r--usr.sbin/mixer/mixer.86
-rw-r--r--usr.sbin/mlxcontrol/mlxcontrol.87
-rw-r--r--usr.sbin/moused/moused.86
-rw-r--r--usr.sbin/mptable/mptable.12
-rw-r--r--usr.sbin/nandsim/nandsim.82
-rw-r--r--usr.sbin/ndiscvt/ndiscvt.84
-rw-r--r--usr.sbin/ndiscvt/ndisgen.82
-rw-r--r--usr.sbin/ngctl/ngctl.82
-rw-r--r--usr.sbin/nghook/nghook.82
-rw-r--r--usr.sbin/nscd/nscd.84
-rw-r--r--usr.sbin/nscd/nscd.conf.55
-rw-r--r--usr.sbin/nvram/nvram.82
-rw-r--r--usr.sbin/ofwdump/ofwdump.82
-rw-r--r--usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.82
-rw-r--r--usr.sbin/periodic/periodic.84
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.82
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.82
-rw-r--r--usr.sbin/pmcstat/pmcstat.82
-rw-r--r--usr.sbin/portsnap/portsnap/portsnap.82
-rw-r--r--usr.sbin/ppp/ppp.86
-rw-r--r--usr.sbin/rarpd/rarpd.84
-rw-r--r--usr.sbin/rpc.umntall/rpc.umntall.82
-rw-r--r--usr.sbin/rpc.yppasswdd/rpc.yppasswdd.82
-rw-r--r--usr.sbin/rpc.ypxfrd/rpc.ypxfrd.82
-rw-r--r--usr.sbin/rtadvctl/rtadvctl.82
-rw-r--r--usr.sbin/rtprio/rtprio.12
-rw-r--r--usr.sbin/sa/sa.82
-rw-r--r--usr.sbin/sicontrol/sicontrol.84
-rw-r--r--usr.sbin/snapinfo/snapinfo.82
-rw-r--r--usr.sbin/sysrc/sysrc.82
-rw-r--r--usr.sbin/tcpdrop/tcpdrop.84
-rw-r--r--usr.sbin/usbdump/usbdump.83
-rw-r--r--usr.sbin/utx/utx.82
-rw-r--r--usr.sbin/vidcontrol/vidcontrol.19
-rw-r--r--usr.sbin/wake/wake.82
-rw-r--r--usr.sbin/watch/watch.82
-rw-r--r--usr.sbin/watchdogd/watchdog.86
-rw-r--r--usr.sbin/watchdogd/watchdogd.88
-rw-r--r--usr.sbin/wpa/hostapd/hostapd.82
-rw-r--r--usr.sbin/wpa/hostapd/hostapd.conf.52
-rw-r--r--usr.sbin/wpa/hostapd_cli/hostapd_cli.82
-rw-r--r--usr.sbin/wpa/ndis_events/ndis_events.82
-rw-r--r--usr.sbin/wpa/wpa_cli/wpa_cli.82
-rw-r--r--usr.sbin/wpa/wpa_passphrase/wpa_passphrase.87
-rw-r--r--usr.sbin/wpa/wpa_supplicant/wpa_supplicant.82
-rw-r--r--usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.52
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.82
-rw-r--r--usr.sbin/ypbind/ypbind.82
-rw-r--r--usr.sbin/yppush/yppush.82
-rw-r--r--usr.sbin/ypserv/ypinit.84
-rw-r--r--usr.sbin/ypserv/ypserv.82
133 files changed, 212 insertions, 224 deletions
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index 78afa37756b6..d12480025325 100644
--- a/libexec/bootpd/bootpd.8
+++ b/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 John Brezak Aq brezak@ch.hp.com
-.An Frank da Cruz Aq fdc@cc.columbia.edu
-.An David R. Linn Aq drl@vuse.vanderbilt.edu
-.An Jim McKim Aq mckim@lerc.nasa.gov
-.An Gordon W. Ross Aq gwr@mc.com
-.An Jason Zions Aq jazz@hal.com .
+.An Danny Backx Aq Mt db@sunbim.be
+.An John Brezak Aq Mt brezak@ch.hp.com
+.An Frank da Cruz Aq Mt fdc@cc.columbia.edu
+.An David R. Linn Aq Mt drl@vuse.vanderbilt.edu
+.An Jim McKim Aq Mt mckim@lerc.nasa.gov
+.An Gordon W. Ross Aq Mt gwr@mc.com
+.An Jason Zions Aq Mt jazz@hal.com .
.Sh BUGS
Individual host entries must not exceed 1024 characters.
diff --git a/libexec/bootpd/tools/bootptest/bootptest.8 b/libexec/bootpd/tools/bootptest/bootptest.8
index 888ff227f124..4ba27244ba57 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.8
+++ b/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
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index e70dc0038d9f..08b8e74c844b 100644
--- a/libexec/mknetid/mknetid.8
+++ b/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
diff --git a/libexec/mknetid/netid.5 b/libexec/mknetid/netid.5
index 011d8f507ec9..b2ec827b28c2 100644
--- a/libexec/mknetid/netid.5
+++ b/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
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 2f783535b767..6841bfda4733 100644
--- a/libexec/pppoed/pppoed.8
+++ b/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
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index f48c327508d8..a17d9669e9dc 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/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
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 281e31a57542..3e0758649f48 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/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
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 9ddd06748eaa..805e090f5f38 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/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 .
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 4ed97a6a399c..67fab31c346d 100644
--- a/usr.sbin/acpi/acpidb/acpidb.8
+++ b/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 .
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index f1c7a18def32..a03917a1baba 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/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 Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
-.An Yasuo YOKOYAMA Aq yokoyama@jp.FreeBSD.org
-.An Nate Lawson Aq njl@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An Yasuo YOKOYAMA Aq Mt yokoyama@jp.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 Takayasu IWANASHI Aq takayasu@wendy.a.perfect-liberty.or.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Hiroki Sato Aq hrs@FreeBSD.org ,
-.An Michael Lucas Aq mwlucas@blackhelicopters.org
+.An Chitoshi Ohsawa Aq Mt ohsawa@catv1.ccn-net.ne.jp ,
+.An Takayasu IWANASHI Aq Mt takayasu@wendy.a.perfect-liberty.or.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Hiroki Sato Aq Mt hrs@FreeBSD.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.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index f23ecffd5b59..2e6a5b5a3897 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/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
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index c7c4f5d067b9..af9fe22cfb3a 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/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.
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 5ce4377ab90f..25fa5aefa061 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/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.
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 3e039b08b1b8..96eb9732b7e6 100644
--- a/usr.sbin/apm/apm.8
+++ b/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 .
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index 633217fd3295..afecd47a3759 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/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 KOIE Hidetaka Aq koie@suri.co.jp
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An KOIE Hidetaka Aq Mt koie@suri.co.jp
.Pp
.An -nosplit
Some contributions made by
-.An Warner Losh Aq imp@FreeBSD.org ,
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Norihiro Kumagai Aq kuma@nk.rim.or.jp ,
-.An NAKAGAWA Yoshihisa Aq nakagawa@jp.FreeBSD.org ,
+.An Warner Losh Aq Mt imp@FreeBSD.org ,
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Norihiro Kumagai Aq Mt kuma@nk.rim.or.jp ,
+.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 .
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 92edb4b790d8..39281375417b 100644
--- a/usr.sbin/asf/asf.8
+++ b/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.
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index aad1aef70635..3cb50c345fae 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/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 Peter Grehan Aq grehan@freebsd.org
+.An Neel Natu Aq Mt neel@freebsd.org
+.An Peter Grehan Aq Mt grehan@freebsd.org
diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8
index 3a300cc00f85..c4220b6906ba 100644
--- a/usr.sbin/bhyveload/bhyveload.8
+++ b/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
diff --git a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
index 9198853c2213..3a37343d253a 100644
--- a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8
index e79935070725..d82d701531b3 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 54df178741fd..ec1ef341aea7 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
index 690b9422d175..50774f18d03b 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
+++ b/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
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.8 b/usr.sbin/bluetooth/bthidd/bthidd.8
index 8dd052edf094..53db4cb810d8 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.8
+++ b/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
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index 54be8237b2c8..af0a67f1cd86 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.8 b/usr.sbin/bluetooth/hcsecd/hcsecd.8
index 8b7084d2de30..a55e85e5ab8c 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5 b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
index 189ca66606c5..a6342aa67cf3 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
+++ b/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
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 8d2dd47be61f..c2d94efd0744 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.8
+++ b/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
diff --git a/usr.sbin/bluetooth/l2control/l2control.8 b/usr.sbin/bluetooth/l2control/l2control.8
index 7636d9422e22..5974167439d1 100644
--- a/usr.sbin/bluetooth/l2control/l2control.8
+++ b/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
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index 73774eccf339..b6233e8407da 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.8
+++ b/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.
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
index 0588d0c3f5db..6763008bd047 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
+++ b/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
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index 8104bba7adec..89db90b85955 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/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
diff --git a/usr.sbin/bluetooth/sdpd/sdpd.8 b/usr.sbin/bluetooth/sdpd/sdpd.8
index 0844e30ee15d..6a7b162a43a5 100644
--- a/usr.sbin/bluetooth/sdpd/sdpd.8
+++ b/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.
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 27f94e062d04..9e413c0a6114 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/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
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 4d97cb52c37a..183302aa4748 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/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
diff --git a/usr.sbin/bsdconfig/bsdconfig.8 b/usr.sbin/bsdconfig/bsdconfig.8
index b99cac248d81..3f25c95ccd1d 100644
--- a/usr.sbin/bsdconfig/bsdconfig.8
+++ b/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
diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
index b841c36df815..98bab0a52bad 100644
--- a/usr.sbin/bsdinstall/bsdinstall.8
+++ b/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 nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
diff --git a/usr.sbin/bsdinstall/partedit/sade.8 b/usr.sbin/bsdinstall/partedit/sade.8
index 441ddc02ab90..79df079e371b 100644
--- a/usr.sbin/bsdinstall/partedit/sade.8
+++ b/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.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index b77b5f7ed6f5..677a276c1897 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 b/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
index 6c0aba3b5b29..44a1590562b3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 774c027dafca..73036c0ed3f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3
index da095ee7eb47..cd9d5796d4cb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 9d9e5991008e..d40aef5e2425 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 b/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
index 6c6af4708e7c..205f11fd26fc 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
+++ b/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
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
index 41e505696a30..a2a118679f40 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
+++ b/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
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 5b514f619cbd..cfa4623e49d9 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/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
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 6a57356086b2..c0d71562b4f9 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/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.
diff --git a/usr.sbin/cpucontrol/cpucontrol.8 b/usr.sbin/cpucontrol/cpucontrol.8
index cb1a29e927a4..91946d3fd7e7 100644
--- a/usr.sbin/cpucontrol/cpucontrol.8
+++ b/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.
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index 5d5a8d9a9ab9..697629f618cd 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/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
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index eed515ee159d..0183c39bdfa3 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/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
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 9be37df264e5..5222d2d99334 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/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
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 66fe8f3f6df2..b9aef315e4fc 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/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
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index ef9947dae56c..4bdda5f451d7 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/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
diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8
index 169902221c5c..73846a96a866 100644
--- a/usr.sbin/ctladm/ctladm.8
+++ b/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
diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5
index 35706670c0aa..02b80c08029d 100644
--- a/usr.sbin/ctld/ctl.conf.5
+++ b/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.
diff --git a/usr.sbin/ctld/ctld.8 b/usr.sbin/ctld/ctld.8
index 60ffbfcf478a..e9e91d403f60 100644
--- a/usr.sbin/ctld/ctld.8
+++ b/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.
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index d5cc6144d1d6..3684b9ff5e7c 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/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
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
.Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
wrote this man-page.
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index a51c93b00698..e48b09fc85bd 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/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
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
.Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
wrote this man-page.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 5476e491f4ef..232f646529f8 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/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
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index 4f8dcd459803..330f44c530c5 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/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
diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8
index ecb3b0126370..a1743fff3851 100644
--- a/usr.sbin/devinfo/devinfo.8
+++ b/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
diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8
index 518eadd69074..86949df6f28b 100644
--- a/usr.sbin/dumpcis/dumpcis.8
+++ b/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 .
diff --git a/usr.sbin/eeprom/eeprom.8 b/usr.sbin/eeprom/eeprom.8
index e132da98b7e6..b5b08bb9ae4e 100644
--- a/usr.sbin/eeprom/eeprom.8
+++ b/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
diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8
index ffd051607312..1e722f9b2c12 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/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.
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 1c231a19bcdd..9f1270f72f03 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/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
diff --git a/usr.sbin/flowctl/flowctl.8 b/usr.sbin/flowctl/flowctl.8
index 5780e10a62d0..a8a1ce1c0bd2 100644
--- a/usr.sbin/flowctl/flowctl.8
+++ b/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 .
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index f372587eee8b..b85a4e4b7682 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/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
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8
index a2767ebc240e..4e9b61b77c39 100644
--- a/usr.sbin/fwcontrol/fwcontrol.8
+++ b/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 Petr Holub Aq hopet@ics.muni.cz
-- MPEG TS mode.
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
+.An Petr Holub Aq Mt hopet@ics.muni.cz
+(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
diff --git a/usr.sbin/gpioctl/gpioctl.8 b/usr.sbin/gpioctl/gpioctl.8
index 4db6714f5bdc..8a433726391a 100644
--- a/usr.sbin/gpioctl/gpioctl.8
+++ b/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
-.Aq gonzo@freebsd.org
+.An Oleksandr Tymoshenko Aq Mt gonzo@freebsd.org .
diff --git a/usr.sbin/gssd/gssd.8 b/usr.sbin/gssd/gssd.8
index 82c531701669..82611f847a15 100644
--- a/usr.sbin/gssd/gssd.8
+++ b/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 .
diff --git a/usr.sbin/i2c/i2c.8 b/usr.sbin/i2c/i2c.8
index cd269fa6e1ae..27f7621156b6 100644
--- a/usr.sbin/i2c/i2c.8
+++ b/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
-.Aq tur@semihalf.com
+.An Bartlomiej Sieka Aq Mt tur@semihalf.com
and
-.An Michal Hajduk
-.Aq mih@semihalf.com .
+.An Michal Hajduk Aq Mt mih@semihalf.com .
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 1d2d517e328e..5223b72cf5f7 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/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
diff --git a/usr.sbin/ipfwpcap/ipfwpcap.8 b/usr.sbin/ipfwpcap/ipfwpcap.8
index 523b059a156f..a161ebbffb47 100644
--- a/usr.sbin/ipfwpcap/ipfwpcap.8
+++ b/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 .
diff --git a/usr.sbin/iscsid/iscsid.8 b/usr.sbin/iscsid/iscsid.8
index 89c7c257e7f0..fbfc55d72c2c 100644
--- a/usr.sbin/iscsid/iscsid.8
+++ b/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.
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 76cc5bb38032..3ffa2709601c 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/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.
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index 4201fde148d7..6769c307fbbc 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -131,12 +131,10 @@ commands appeared in
.Fx 2.1 .
.Sh AUTHORS
.An -nosplit
-.An Wolfram Schneider
-.Aq wosch@FreeBSD.org
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org
wrote the original Perl version.
The current version was rewritten in C by
-.An Jonathan Belson
-.Aq jon@witchspace.com
+.An Jonathan Belson Aq Mt jon@witchspace.com
for
.Fx 5.0 .
.Sh BUGS
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 7f810d4e6460..72d0bf5cfe86 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/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
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index a69af33d1829..1a3b9118dd5c 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/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 .
diff --git a/usr.sbin/lmcconfig/lmcconfig.8 b/usr.sbin/lmcconfig/lmcconfig.8
index 06fcc9e1a224..6eac2574c8b1 100644
--- a/usr.sbin/lmcconfig/lmcconfig.8
+++ b/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
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index c2524a159c70..b41546242b15 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/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
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 6e498f643f1b..11bfe9539585 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/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
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 51e536f030ae..91ab2048718d 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -363,12 +363,11 @@ The
utility appeared in
.Nx 1.6 .
.Sh AUTHORS
-.An Luke Mewburn
-.Aq lukem@NetBSD.org
+.An Luke Mewburn Aq Mt lukem@NetBSD.org
(original program)
-.An Daniel Watt ,
-.An Walter Deignan ,
-.An Ryan Gabrys ,
-.An Alan Perez-Rathke ,
+.An Daniel Watt
+.An Walter Deignan
+.An Ryan Gabrys
+.An Alan Perez-Rathke
.An Ram Vedam
(cd9660 support)
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 1cff9841ebd7..c3e22a055961 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/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 .
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 5c5f6bf3e31d..6e569cc8cfd9 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/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 .
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 4ad6b63b8c6c..33788b94b070 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.8
+++ b/usr.sbin/mlxcontrol/mlxcontrol.8
@@ -136,9 +136,10 @@ Print usage information for
.Ar command .
.El
.Sh AUTHORS
-The mlxcontrol utility was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+The
+.Nm
+utility was written by
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
.Sh BUGS
The
.Ar config
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 5e4dd432a7f1..27990929e7be 100644
--- a/usr.sbin/moused/moused.8
+++ b/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
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 56f901a7c7ce..83e4cea1908e 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/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
diff --git a/usr.sbin/nandsim/nandsim.8 b/usr.sbin/nandsim/nandsim.8
index 5b318a233dae..c7bdb9a4f019 100644
--- a/usr.sbin/nandsim/nandsim.8
+++ b/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 .
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index a9bc916141f2..f4974958e005 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/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 .
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
index c4ad4950be49..2fb4f401596e 100644
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ b/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 .
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index ce77069d3185..8ba9f5d2854d 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/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
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 7d2c7fa5f5cc..651a6fad1bc0 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/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.
diff --git a/usr.sbin/nscd/nscd.8 b/usr.sbin/nscd/nscd.8
index 7e19af93cd5b..f54c18582ee3 100644
--- a/usr.sbin/nscd/nscd.8
+++ b/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 .
diff --git a/usr.sbin/nscd/nscd.conf.5 b/usr.sbin/nscd/nscd.conf.5
index b59449b11157..eb28eca7db2f 100644
--- a/usr.sbin/nscd/nscd.conf.5
+++ b/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
-.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 .
diff --git a/usr.sbin/nvram/nvram.8 b/usr.sbin/nvram/nvram.8
index 5c41a41454dd..ffc005e4364f 100644
--- a/usr.sbin/nvram/nvram.8
+++ b/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
diff --git a/usr.sbin/ofwdump/ofwdump.8 b/usr.sbin/ofwdump/ofwdump.8
index ad9cfa76890b..b21d87822a10 100644
--- a/usr.sbin/ofwdump/ofwdump.8
+++ b/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 .
diff --git a/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8 b/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
index c3eef64d276f..bcc1f30c309e 100644
--- a/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
+++ b/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
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 22a96a2a647d..175119de5a39 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/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 Brian Somers Aq brian@Awfulhak.org
+.An Paul Traina Aq Mt pst@FreeBSD.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
.Sh BUGS
Since one specifies information about a directory using shell
variables containing the string,
diff --git a/usr.sbin/pmcannotate/pmcannotate.8 b/usr.sbin/pmcannotate/pmcannotate.8
index 8f791c15cc9d..08967d9d7bf9 100644
--- a/usr.sbin/pmcannotate/pmcannotate.8
+++ b/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
diff --git a/usr.sbin/pmccontrol/pmccontrol.8 b/usr.sbin/pmccontrol/pmccontrol.8
index f436753dd372..a5b6baa2874f 100644
--- a/usr.sbin/pmccontrol/pmccontrol.8
+++ b/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
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index 4ac611f647cb..6662d43c21d9 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/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
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index 0e9bd7efce3e..db215f184332 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -274,4 +274,4 @@ Default location where the ports tree is extracted.
.Xr fetch 3 ,
.Xr portsnap.conf 5
.Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index c4ebe501c725..59eeaed23d33 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -6061,14 +6061,14 @@ This socket is used to pass links between different instances of
.Xr vipw 8
.Sh HISTORY
This program was originally written by
-.An Toshiharu OHNO Aq tony-o@iij.ad.jp ,
+.An Toshiharu OHNO Aq Mt tony-o@iij.ad.jp ,
and was submitted to
.Fx 2.0.5
by
-.An Atsushi Murai Aq amurai@spec.co.jp .
+.An Atsushi Murai Aq Mt amurai@spec.co.jp .
.Pp
It was substantially modified during 1997 by
-.An Brian Somers Aq brian@Awfulhak.org ,
+.An Brian Somers Aq Mt brian@Awfulhak.org ,
and was ported to
.Ox
in November that year
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 3c75de0032fa..4b00c9e7b83a 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -141,9 +141,9 @@ Enable verbose syslogging.
.Re
.Sh AUTHORS
.An -nosplit
-.An Craig Leres Aq leres@ee.lbl.gov
+.An Craig Leres Aq Mt leres@ee.lbl.gov
and
-.An Steven McCanne Aq mccanne@ee.lbl.gov .
+.An Steven McCanne Aq Mt mccanne@ee.lbl.gov .
Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
.Sh BUGS
The
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.8 b/usr.sbin/rpc.umntall/rpc.umntall.8
index 623663575532..7f294a0457d3 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.8
+++ b/usr.sbin/rpc.umntall/rpc.umntall.8
@@ -123,4 +123,4 @@ The
utility first appeared in
.Fx 4.0 .
.Sh AUTHORS
-.An Martin Blapp Aq mb@imp.ch
+.An Martin Blapp Aq Mt mb@imp.ch
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 376390866a84..3d0b48664ba6 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -335,7 +335,7 @@ The template password file(s) for non-default domains
.Xr ypserv 8 ,
.Xr ypxfr 8
.Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
.Sh BUGS
As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
procedure takes two arguments: a V7-style passwd structure containing
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index ad0c03e04575..5a7f8dab24b9 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -134,7 +134,7 @@ The NIS maps for a particular NIS domain.
.Xr ypserv 8 ,
.Xr ypxfr 8
.Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
.Sh BUGS
The
.Fx
diff --git a/usr.sbin/rtadvctl/rtadvctl.8 b/usr.sbin/rtadvctl/rtadvctl.8
index be3eefea7c54..5df6e5cc2349 100644
--- a/usr.sbin/rtadvctl/rtadvctl.8
+++ b/usr.sbin/rtadvctl/rtadvctl.8
@@ -102,4 +102,4 @@ command first appeared in
.Sh AUTHORS
.Nm
was written by
-.An "Hiroki Sato" Aq hrs@FreeBSD.org .
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org .
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 22d064513a82..85130c87f7e0 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -171,7 +171,7 @@ utility appeared in
but is similar to the HP-UX version.
.Sh AUTHORS
.An -nosplit
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
+.An Henrik Vestergaard Draboel Aq Mt hvd@terry.ping.dk
is the original author.
This
implementation in
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 56c6994dc516..1b66ac2a12e9 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -235,7 +235,7 @@ per-user accounting summary database
.Xr ac 8 ,
.Xr accton 8
.Sh AUTHORS
-.An Chris G. Demetriou Aq cgd@postgres.berkeley.edu
+.An Chris G. Demetriou Aq Mt cgd@postgres.berkeley.edu
.Sh CAVEATS
While the behavior of the options in this version of
.Nm
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index a3aa87a191a8..1503591ecf51 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -99,11 +99,11 @@ The
utility is loosely based on a utility called
.Nm siconfig
which was written by
-.An Andy Rutter Aq andy@acronym.co.uk
+.An Andy Rutter Aq Mt andy@acronym.co.uk .
.Pp
Specialix International do not support this device driver in any way.
.Sh AUTHORS
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
.Sh BUGS
Bound to be many...
:-)
diff --git a/usr.sbin/snapinfo/snapinfo.8 b/usr.sbin/snapinfo/snapinfo.8
index a7857fca8b47..010291ecb2c7 100644
--- a/usr.sbin/snapinfo/snapinfo.8
+++ b/usr.sbin/snapinfo/snapinfo.8
@@ -63,4 +63,4 @@ The
utility first appeared in
.Fx 6.1 .
.Sh AUTHORS
-.An Mark Santcroos Aq marks@FreeBSD.org
+.An Mark Santcroos Aq Mt marks@FreeBSD.org
diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8
index e3b873fee1a9..1bf97b73b075 100644
--- a/usr.sbin/sysrc/sysrc.8
+++ b/usr.sbin/sysrc/sysrc.8
@@ -301,7 +301,7 @@ A
utility first appeared in
.Fx 9.2 .
.Sh AUTHORS
-.An Devin Teske Aq dteske@FreeBSD.org
+.An Devin Teske Aq Mt dteske@FreeBSD.org
.Sh THANKS TO
Brandon Gooch, Garrett Cooper, Julian Elischer, Pawel Jakub Dawidek,
Cyrille Lefevre, Ross West, Stefan Esser, Marco Steinbach, and Jilles Tjoelker
diff --git a/usr.sbin/tcpdrop/tcpdrop.8 b/usr.sbin/tcpdrop/tcpdrop.8
index 9649dec81419..61c3f372c762 100644
--- a/usr.sbin/tcpdrop/tcpdrop.8
+++ b/usr.sbin/tcpdrop/tcpdrop.8
@@ -93,5 +93,5 @@ port 22, the port used by
.Xr netstat 1 ,
.Xr sockstat 1
.Sh AUTHORS
-.An Markus Friedl Aq markus@openbsd.org
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Markus Friedl Aq Mt markus@openbsd.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/usr.sbin/usbdump/usbdump.8 b/usr.sbin/usbdump/usbdump.8
index 05ff3f9668cc..475e832cd03b 100644
--- a/usr.sbin/usbdump/usbdump.8
+++ b/usr.sbin/usbdump/usbdump.8
@@ -154,5 +154,4 @@ Optional field used for printing an error string if the packet is from USB done.
.Sh SEE ALSO
.Xr usbconfig 8
.Sh AUTHORS
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org
diff --git a/usr.sbin/utx/utx.8 b/usr.sbin/utx/utx.8
index 363a46a281d4..21794964add3 100644
--- a/usr.sbin/utx/utx.8
+++ b/usr.sbin/utx/utx.8
@@ -94,4 +94,4 @@ utility replaced
in
.Fx 10.0 .
.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index a36d3780c8b7..d46bd6d71681 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -535,8 +535,9 @@ and
categories of the
.Em "Ports Collection" .
.Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
-.An Sascha Wildner
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
+.An Sascha Wildner Aq Mt saw@online.de
.Sh CONTRIBUTORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org ,
-.An Nik Clayton Aq nik@FreeBSD.org
+.An -split
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
+.An Nik Clayton Aq Mt nik@FreeBSD.org
diff --git a/usr.sbin/wake/wake.8 b/usr.sbin/wake/wake.8
index 53249073b6fa..4abd607f11e2 100644
--- a/usr.sbin/wake/wake.8
+++ b/usr.sbin/wake/wake.8
@@ -65,4 +65,4 @@ Ethernet host name data base.
.Sh AUTHORS
.Nm
was written by
-.Ar Marc Balmer Aq marc@msys.ch .
+.Ar Marc Balmer Aq Mt marc@msys.ch .
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index 99c6b6feab94..052c95d49b87 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -114,7 +114,7 @@ The
utility first appeared in
.Fx 2.1 .
.Sh AUTHORS
-.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il
+.An Ugen J.S. Antsilevich Aq Mt ugen@NetVision.net.il
.Sh BUGS
No terminal emulation is performed.
All user output is reproduced as-is.
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index 9ca9fe0ef27f..a82f6e310c29 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -65,9 +65,9 @@ utility appeared in
The
.Nm
utility and manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org
and
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
.Pp
Some contributions made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index d50a964cb994..1d76eeeaf8d4 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -302,12 +302,12 @@ utility appeared in
The
.Nm
utility and manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org
and
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
.Pp
Some contributions made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
.Pp
The pretimeout and softtimeout action system was added by
-.An Alfred Perlstein Aq alfred@freebsd.org .
+.An Alfred Perlstein Aq Mt alfred@freebsd.org .
diff --git a/usr.sbin/wpa/hostapd/hostapd.8 b/usr.sbin/wpa/hostapd/hostapd.8
index f624cac03e52..9edbd65438c3 100644
--- a/usr.sbin/wpa/hostapd/hostapd.8
+++ b/usr.sbin/wpa/hostapd/hostapd.8
@@ -129,7 +129,7 @@ utility first appeared in
The
.Nm
utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
This manual page is derived from the
.Pa README
file included in the
diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5
index 08a04fe9282c..e166f365745c 100644
--- a/usr.sbin/wpa/hostapd/hostapd.conf.5
+++ b/usr.sbin/wpa/hostapd/hostapd.conf.5
@@ -208,4 +208,4 @@ and
files in the
.Nm hostapd
distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
index eb7f60f028a6..605a7f5d2a94 100644
--- a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
@@ -104,7 +104,7 @@ utility first appeared in
The
.Nm
utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
This manual page is derived from the
.Pa README
file included in the
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
index 44ce6b9bca71..bf11c1943fec 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ b/usr.sbin/wpa/ndis_events/ndis_events.8
@@ -132,4 +132,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 .
diff --git a/usr.sbin/wpa/wpa_cli/wpa_cli.8 b/usr.sbin/wpa/wpa_cli/wpa_cli.8
index fdb24fc49f0f..a2bf189a3f8c 100644
--- a/usr.sbin/wpa/wpa_cli/wpa_cli.8
+++ b/usr.sbin/wpa/wpa_cli/wpa_cli.8
@@ -214,7 +214,7 @@ utility first appeared in
The
.Nm
utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
This manual page is derived from the
.Pa README
file included in the
diff --git a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
index c66d658d31ae..b661a792dd73 100644
--- a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
+++ b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
@@ -55,12 +55,11 @@ The
utility first appeared in
.Fx 6.3 .
.Sh AUTHORS
+.An -nosplit
The
.Nm
utility was written by
-.An Jouni Malinen
-.Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
.Pp
This manual page was written by
-.An Henrik Brix Andersen
-.Aq henrik@brixandersen.dk .
+.An Henrik Brix Andersen Aq Mt henrik@brixandersen.dk .
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
index 466759dd2e61..fe9fdce4f7fa 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
@@ -176,7 +176,7 @@ utility first appeared in
The
.Nm
utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
This manual page is derived from the
.Pa README
file included in the
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 5d6914fccb9d..94e3100bcab4 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -575,4 +575,4 @@ and
files in the
.Nm wpa_supplicant
distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 125123519c05..2689f292332c 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -206,4 +206,4 @@ to build the NIS databases
.Xr db 3 ,
.Xr ypserv 8
.Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 34ce2175a9f1..acd20eb06273 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -199,4 +199,4 @@ ypbind startup options are specified
.Xr ypserv 8 ,
.Xr ypset 8
.Sh AUTHORS
-.An Theo de Raadt Aq deraadt@fsa.ca
+.An Theo de Raadt Aq Mt deraadt@fsa.ca
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 1acac3f7fc97..b82c8f72a258 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -171,7 +171,7 @@ a particular NIS domain
.Xr ypserv 8 ,
.Xr ypxfr 8
.Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
.Sh BUGS
The mechanism for transferring NIS maps in NIS v1 is different
than that in NIS version 2.
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 524ec5ee4c12..e161a4a21f41 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -191,8 +191,8 @@ It first appeared in
.Sh AUTHORS
.An -nosplit
The original script was written by
-.An Mats O Jansson Aq moj@stacken.kth.se .
+.An Mats O Jansson Aq Mt moj@stacken.kth.se .
It was modified for
.Fx
by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index b212c49805c0..f255118179e3 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -460,4 +460,4 @@ This version of
first appeared in
.Fx 2.2 .
.Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu