use .Mt to mark up email addresses consistently (final part)

PR: 191174 Submitted by: Franco Fichtner <franco at lastsummer.de>
author: bapt <bapt@FreeBSD.org> 2014-06-26 21:46:14 +0000
committer: bapt <bapt@FreeBSD.org> 2014-06-26 21:46:14 +0000
commit: 5da5395a98758fa50d5c1b8a2b98e63e6021ccac (patch)
tree: 023fa0b0ff2a8ca1fc93dd3b0d5e142b36f3e19c
parent: c6d679e670d0710831f1978b7d379e5cec49186a (diff)
download: FreeBSD-src-5da5395a98758fa50d5c1b8a2b98e63e6021ccac.zip
FreeBSD-src-5da5395a98758fa50d5c1b8a2b98e63e6021ccac.tar.gz
411 files changed, 678 insertions, 737 deletions
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index d0f3701..e0ffcaa 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -289,10 +289,8 @@ The
 driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An Mike Smith
-.Aq msmith@FreeBSD.org
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 .Sh BUGS
 This driver is not compatible with Dell controllers that have version 1.x
 firmware.
diff --git a/share/man/man4/aacraid.4 b/share/man/man4/aacraid.4
index 5d22ac2..2ca830d 100644
--- a/share/man/man4/aacraid.4
+++ b/share/man/man4/aacraid.4
@@ -128,11 +128,8 @@ and are also queued for retrieval by a management application.
 .Xr scsi 4 ,
 .Xr kldload 8
 .Sh AUTHORS
-.An Achim Leubner
-.Aq achim@FreeBSD.org
-.An Ed Maste
-.Aq emaste@FreeBSD.org
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Achim Leubner Aq Mt achim@FreeBSD.org
+.An Ed Maste Aq Mt emaste@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 .Sh BUGS
 The controller is not actually paused on suspend/resume.
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 04ccbfb..80c567f 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -609,16 +609,16 @@ The following people made notable contributions to the ACPI subsystem
 in
 .Fx :
 .An Michael Smith ,
-.An Takanori Watanabe Aq takawata@jp.FreeBSD.org ,
-.An Mitsuru IWASAKI Aq iwasaki@jp.FreeBSD.org ,
+.An Takanori Watanabe Aq Mt takawata@jp.FreeBSD.org ,
+.An Mitsuru IWASAKI Aq Mt iwasaki@jp.FreeBSD.org ,
 .An Munehiro Matsuda ,
 .An Nate Lawson ,
 the ACPI-jp mailing list at
-.Aq acpi-jp@jp.FreeBSD.org ,
+.Aq Mt acpi-jp@jp.FreeBSD.org ,
 and many other contributors.
 .Pp
 This manual page was written by
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 Many BIOS versions have serious bugs that may cause system instability,
 break suspend/resume, or prevent devices from operating properly due to
diff --git a/share/man/man4/acpi_asus.4 b/share/man/man4/acpi_asus.4
index 1921adc..124999a 100644
--- a/share/man/man4/acpi_asus.4
+++ b/share/man/man4/acpi_asus.4
@@ -175,7 +175,7 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
 .Pp
 Inspiration came from the
 .Em acpi4asus project
diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4
index 129894b..9949b3b 100644
--- a/share/man/man4/acpi_asus_wmi.4
+++ b/share/man/man4/acpi_asus_wmi.4
@@ -87,4 +87,4 @@ The
 driver first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/acpi_dock.4 b/share/man/man4/acpi_dock.4
index 1fda11d..db23b3b 100644
--- a/share/man/man4/acpi_dock.4
+++ b/share/man/man4/acpi_dock.4
@@ -59,4 +59,4 @@ device driver first appeared in
 The
 .Nm
 device driver was written by
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org .
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org .
diff --git a/share/man/man4/acpi_fujitsu.4 b/share/man/man4/acpi_fujitsu.4
index ef72fee..5a82718 100644
--- a/share/man/man4/acpi_fujitsu.4
+++ b/share/man/man4/acpi_fujitsu.4
@@ -166,10 +166,10 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Sean Bullington Aq shegget@gmail.com ,
-.An Anish Mistry Aq mistry.7@osu.edu ,
+.An Sean Bullington Aq Mt shegget@gmail.com ,
+.An Anish Mistry Aq Mt mistry.7@osu.edu ,
 and
-.An Marc Santcroos Aq marks@ripe.net .
+.An Marc Santcroos Aq Mt marks@ripe.net .
 .Pp
 This manual page was written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4
index 028d19a..2ea74cf 100644
--- a/share/man/man4/acpi_hp.4
+++ b/share/man/man4/acpi_hp.4
@@ -261,7 +261,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Pp
 It has been inspired by hp-wmi driver, which implements a subset of these
 features (hotkeys) on Linux.
@@ -275,7 +275,7 @@ http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx
 .El
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Sh BUGS
 This driver is experimental and has only been tested on i386 on an
 HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN).
diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4
index 4aa6d9f..d566207 100644
--- a/share/man/man4/acpi_ibm.4
+++ b/share/man/man4/acpi_ibm.4
@@ -476,10 +476,10 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org
 and later mostly rewritten by
-.An Markus Brueffer Aq markus@FreeBSD.org .
+.An Markus Brueffer Aq Mt markus@FreeBSD.org .
 This manual page was written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org
 and
-.An Markus Brueffer Aq markus@FreeBSD.org .
+.An Markus Brueffer Aq Mt markus@FreeBSD.org .
diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4
index 5458a31..9ea36e4 100644
--- a/share/man/man4/acpi_panasonic.4
+++ b/share/man/man4/acpi_panasonic.4
@@ -173,6 +173,6 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An OGAWA Takaya Aq t\-ogawa@triaez.kaisei.org
+.An OGAWA Takaya Aq Mt t-ogawa@triaez.kaisei.org
 and
-.An TAKAHASHI Yoshihiro Aq nyan@FreeBSD.org .
+.An TAKAHASHI Yoshihiro Aq Mt nyan@FreeBSD.org .
diff --git a/share/man/man4/acpi_rapidstart.4 b/share/man/man4/acpi_rapidstart.4
index fa246f6..0bfa1bd 100644
--- a/share/man/man4/acpi_rapidstart.4
+++ b/share/man/man4/acpi_rapidstart.4
@@ -81,4 +81,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org .
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org .
diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index f0fb0e0..c40ffcf 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -79,4 +79,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org .
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org .
diff --git a/share/man/man4/acpi_toshiba.4 b/share/man/man4/acpi_toshiba.4
index 134ecc8..3bf19d4 100644
--- a/share/man/man4/acpi_toshiba.4
+++ b/share/man/man4/acpi_toshiba.4
@@ -123,6 +123,6 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Hiroyuki Aizu Aq aizu@navi.org .
+.An Hiroyuki Aizu Aq Mt aizu@navi.org .
 This manual page was written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
diff --git a/share/man/man4/acpi_video.4 b/share/man/man4/acpi_video.4
index c286784..2bdd3fb 100644
--- a/share/man/man4/acpi_video.4
+++ b/share/man/man4/acpi_video.4
@@ -78,9 +78,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Taku YAMAMOTO Aq taku@cent.saitama-u.ac.jp .
+.An Taku YAMAMOTO Aq Mt taku@cent.saitama-u.ac.jp .
 This manual page was written by
-.An Mark Santcroos Aq marks@ripe.net .
+.An Mark Santcroos Aq Mt marks@ripe.net .
 .Sh BUGS
 Some systems only perform output switching via SMM even though they export
 the proper information via ACPI.
diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4
index 28bd0da..fffb680 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -85,7 +85,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Pp
 Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho.
 .Pp
@@ -93,4 +93,4 @@ See http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx for
 the specification of ACPI-WMI.
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4
index 760fa66..433a547 100644
--- a/share/man/man4/ada.4
+++ b/share/man/man4/ada.4
@@ -154,4 +154,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/ae.4 b/share/man/man4/ae.4
index 6bfe9d6..c7cf25e 100644
--- a/share/man/man4/ae.4
+++ b/share/man/man4/ae.4
@@ -137,8 +137,7 @@ instead.
 The
 .Nm
 driver and this manual page was written by
-.An Stanislav Sedov
-.Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
 .Sh BUGS
diff --git a/share/man/man4/aesni.4 b/share/man/man4/aesni.4
index 0001ca2..3a8e101 100644
--- a/share/man/man4/aesni.4
+++ b/share/man/man4/aesni.4
@@ -87,7 +87,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Konstantin Belousov Aq kib@FreeBSD.org .
+.An Konstantin Belousov Aq Mt kib@FreeBSD.org .
 The key schedule calculation code was adopted from the sample provided
 by Intel and used in the analogous
 .Ox
diff --git a/share/man/man4/age.4 b/share/man/man4/age.4
index 28e52c2..054627f 100644
--- a/share/man/man4/age.4
+++ b/share/man/man4/age.4
@@ -181,7 +181,6 @@ Display lots of useful MAC counters maintained in the driver.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4
index 1019e6d..67ead8d 100644
--- a/share/man/man4/ahci.4
+++ b/share/man/man4/ahci.4
@@ -181,4 +181,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/aibs.4 b/share/man/man4/aibs.4
index b955f0f..c760465 100644
--- a/share/man/man4/aibs.4
+++ b/share/man/man4/aibs.4
@@ -194,7 +194,7 @@ driver was written for
 and
 .Fx
 by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org ,
+.An Constantine A. Murenin Aq Mt cnst@FreeBSD.org ,
 Raouf Boutaba Research Group,
 David R. Cheriton School of Computer Science,
 University of Waterloo.
diff --git a/share/man/man4/alc.4 b/share/man/man4/alc.4
index 9fe3c29..0c6af6a 100644
--- a/share/man/man4/alc.4
+++ b/share/man/man4/alc.4
@@ -162,7 +162,6 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 8.0 .
diff --git a/share/man/man4/ale.4 b/share/man/man4/ale.4
index d5102a1..85fc6e2 100644
--- a/share/man/man4/ale.4
+++ b/share/man/man4/ale.4
@@ -156,7 +156,6 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
diff --git a/share/man/man4/alpm.4 b/share/man/man4/alpm.4
index 43ee459..5bfa877 100644
--- a/share/man/man4/alpm.4
+++ b/share/man/man4/alpm.4
@@ -57,6 +57,6 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Nicolas Souchu Aq nsouch@FreeBSD.org
+.An Nicolas Souchu Aq Mt nsouch@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/amdpm.4 b/share/man/man4/amdpm.4
index f791a28..9f6ab7c 100644
--- a/share/man/man4/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -67,6 +67,6 @@ Based heavily on the
 driver by
 .An Nicolas Souchu .
 This manual page was written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/amdsbwd.4 b/share/man/man4/amdsbwd.4
index cfb2f79..429ca44 100644
--- a/share/man/man4/amdsbwd.4
+++ b/share/man/man4/amdsbwd.4
@@ -69,6 +69,6 @@ and
 The
 .Nm
 driver was written by
-.An Andriy Gapon Aq avg@FreeBSD.org .
+.An Andriy Gapon Aq Mt avg@FreeBSD.org .
 This manual page was written by
-.An Andriy Gapon Aq avg@FreeBSD.org .
+.An Andriy Gapon Aq Mt avg@FreeBSD.org .
diff --git a/share/man/man4/amdsmb.4 b/share/man/man4/amdsmb.4
index c038584..93018d8 100644
--- a/share/man/man4/amdsmb.4
+++ b/share/man/man4/amdsmb.4
@@ -51,4 +51,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4
index 52444f5..86b7a40 100644
--- a/share/man/man4/amdtemp.4
+++ b/share/man/man4/amdtemp.4
@@ -91,9 +91,9 @@ The
 driver first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
-.An Rui Paulo Aq rpaulo@FreeBSD.org
-.An Norikatsu Shigemura Aq nork@FreeBSD.org
-.An Jung-uk Kim Aq jkim@FreeBSD.org
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
+.An Norikatsu Shigemura Aq Mt nork@FreeBSD.org
+.An Jung-uk Kim Aq Mt jkim@FreeBSD.org
 .Sh CAVEATS
 For Family 10h and later processors,
 .Do
diff --git a/share/man/man4/amr.4 b/share/man/man4/amr.4
index ad94ffe..1a38ee9 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -233,9 +233,9 @@ An I/O error has occurred.
 The
 .Nm
 driver was written by
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Mike Smith Aq msmith@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
 and
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 608a4ed..dd21376 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -141,4 +141,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/aout.4 b/share/man/man4/aout.4
index e44362e..a15ab97 100644
--- a/share/man/man4/aout.4
+++ b/share/man/man4/aout.4
@@ -141,6 +141,6 @@ it was superseded by
 The
 .Nm
 manual page was written by
-.An Konstantin Belousov Aq kib@FreeBSD.org .
+.An Konstantin Belousov Aq Mt kib@FreeBSD.org .
 .Sh BUGS
 On 64bit architectures, not all wrappers for older syscalls are implemented.
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index 1d4d650..b34bbd7 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -163,7 +163,7 @@ driver first appeared in
 .Fx 5.4 .
 .Sh AUTHORS
 The driver was written by
-.An Erich Chen Aq erich@areca.com.tw .
+.An Erich Chen Aq Mt erich@areca.com.tw .
 .Sh BUGS
 The driver has been tested on i386 and amd64.
 It likely requires additional
diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4
index 6ad3744..c74dc9e 100644
--- a/share/man/man4/asmc.4
+++ b/share/man/man4/asmc.4
@@ -155,9 +155,8 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An -nosplit
-.An Rui Paulo Aq rpaulo@FreeBSD.org
-(Google Summer of Code project).
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
+(Google Summer of Code project)
 .Sh BUGS
 Support for the latest models was never tested and is most likely not
 fully working.
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 955eb0f..9311d64 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -108,8 +108,8 @@ The
 .Nm
 driver was kindly donated by Adaptec
 and is maintained by
-.An Mark Salyzyn Aq mark_salyzyn@adaptec.com .
+.An Mark Salyzyn Aq Mt mark_salyzyn@adaptec.com .
 This manual page was written by
 .An Mark Salyzyn
 and fixed up by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index a1cbad3..4b53bf7 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -267,7 +267,5 @@ It was turned into a
 interface module in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Alexander Motin
-.Aq mav@FreeBSD.org ,
-.An S\(/oren Schmidt
-.Aq sos@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 17ccef5..202963a 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -223,8 +223,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 This manual page was written by
 .An Kazutaka Yokota .
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 46d30c1..d0fc50d 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -116,4 +116,4 @@ It is based on the kbdio module in
 The kbdio module, the
 .Nm
 driver and this manual page were written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/atp.4 b/share/man/man4/atp.4
index f782798..6309d09 100644
--- a/share/man/man4/atp.4
+++ b/share/man/man4/atp.4
@@ -154,4 +154,4 @@ types.
 The
 .Nm
 driver was written by
-.An Rohit Grover Aq rgrover1@gmail.com .
+.An Rohit Grover Aq Mt rgrover1@gmail.com .
diff --git a/share/man/man4/audit.4 b/share/man/man4/audit.4
index 8fbce7d..9f3f17f 100644
--- a/share/man/man4/audit.4
+++ b/share/man/man4/audit.4
@@ -123,7 +123,7 @@ The Basic Security Module (BSM) interface to audit records and audit event
 stream format were defined by Sun Microsystems.
 .Pp
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Sh BUGS
 The
 .Fx
diff --git a/share/man/man4/auditpipe.4 b/share/man/man4/auditpipe.4
index 19db856..af20f80 100644
--- a/share/man/man4/auditpipe.4
+++ b/share/man/man4/auditpipe.4
@@ -234,7 +234,7 @@ Support for kernel audit first appeared in
 .Fx 6.2 .
 .Sh AUTHORS
 The audit pipe facility was designed and implemented by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Pp
 The Basic Security Module (BSM) interface to audit records and audit event
 stream format were defined by Sun Microsystems.
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index c708c89..cfb5929 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -202,4 +202,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 65e1887..06241a6 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -255,4 +255,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4
index 33f7db3..d89ea8c 100644
--- a/share/man/man4/axge.4
+++ b/share/man/man4/axge.4
@@ -137,14 +137,15 @@ The
 device driver first appeared in
 .Fx 10.1 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Kevin Lo Aq kevlo@FreeBSD.org
+.An Kevin Lo Aq Mt kevlo@FreeBSD.org
 and
-.An Li-Wen Hsu Aq lwhsu@FreeBSD.org .
+.An Li-Wen Hsu Aq Mt lwhsu@FreeBSD.org .
 This manual page was adapted by
-.An Mark Johnston Aq markj@FreeBSD.org
+.An Mark Johnston Aq Mt markj@FreeBSD.org
 from the
 .Xr axe 4
 manual page.
diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4
index 004ffa3..9d7fc9d 100644
--- a/share/man/man4/bce.4
+++ b/share/man/man4/bce.4
@@ -411,7 +411,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -429,4 +429,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An David Christensen Aq davidch@broadcom.com .
+.An David Christensen Aq Mt davidch@broadcom.com .
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index dc31ff6..474b48f 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -261,4 +261,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/bhyve.4 b/share/man/man4/bhyve.4
index cdfc1e2..4947ecf 100644
--- a/share/man/man4/bhyve.4
+++ b/share/man/man4/bhyve.4
@@ -58,9 +58,9 @@ and was developed at NetApp Inc.
 .Nm
 was developed by
 .An -nosplit
-.An "Peter Grehan" Aq grehan@FreeBSD.org
+.An Peter Grehan Aq Mt grehan@FreeBSD.org
 and
-.An "Neel Natu" Aq neel@FreeBSD.org
+.An Neel Natu Aq Mt neel@FreeBSD.org
 at NetApp Inc.
 .Sh BUGS
 .Nm
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 59136bf..5590b4a 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -257,10 +257,10 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This driver is based on the work of
-.An Jim Lowe Aq james@miller.cs.uwm.edu ,
-.An Mark Tinguely Aq tinguely@plains.nodak.edu ,
-.An Amancio Hasty Aq hasty@star-gate.com ,
-.An Roger Hardiman Aq roger@FreeBSD.org
+.An Jim Lowe Aq Mt james@miller.cs.uwm.edu ,
+.An Mark Tinguely Aq Mt tinguely@plains.nodak.edu ,
+.An Amancio Hasty Aq Mt hasty@star-gate.com ,
+.An Roger Hardiman Aq Mt roger@FreeBSD.org
 and a bunch of other people.
 Support for Pinnacle PCTV Rave cards was added by
-.An Branko Lankester Aq branko@euro.net .
+.An Branko Lankester Aq Mt branko@euro.net .
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index ec54666..cecffc5 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -500,20 +500,17 @@ driver first appeared in
 The
 .Nm bridge
 driver was originally written by
-.An Jason L. Wright
-.Aq jason@thought.net
+.An Jason L. Wright Aq Mt jason@thought.net
 as part of an undergraduate independent study at the University of
 North Carolina at Greensboro.
 .Pp
 This version of the
 .Nm
 driver has been heavily modified from the original version by
-.An Jason R. Thorpe
-.Aq thorpej@wasabisystems.com .
+.An Jason R. Thorpe Aq Mt thorpej@wasabisystems.com .
 .Pp
 Rapid Spanning Tree Protocol (RSTP) support was added by
-.An Andrew Thompson
-.Aq thompsa@FreeBSD.org .
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/bwn.4 b/share/man/man4/bwn.4
index 4aa75fd..3dc43b4 100644
--- a/share/man/man4/bwn.4
+++ b/share/man/man4/bwn.4
@@ -146,8 +146,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
 .\".Sh BUGS
 .\"Some card based on the BCM4306 and BCM4309 chips do not work properly
 .\"on channel 1, 2 and 3.
diff --git a/share/man/man4/bxe.4 b/share/man/man4/bxe.4
index 0067385..cdc23f5 100644
--- a/share/man/man4/bxe.4
+++ b/share/man/man4/bxe.4
@@ -320,7 +320,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr altq 4 ,
@@ -338,7 +338,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Eric Davis Aq edavis@broadcom.com ,
-.An David Christensen Aq davidch@broadcom.com ,
+.An Eric Davis Aq Mt edavis@broadcom.com ,
+.An David Christensen Aq Mt davidch@broadcom.com ,
 and
-.An Gary Zambrano Aq zambrano@broadcom.com .
+.An Gary Zambrano Aq Mt zambrano@broadcom.com .
diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4
index 9009d3f..9290cbc 100644
--- a/share/man/man4/capsicum.4
+++ b/share/man/man4/capsicum.4
@@ -116,15 +116,15 @@ and was developed at the University of Cambridge.
 .Nm
 was developed by
 .An -nosplit
-.An "Robert Watson" Aq rwatson@FreeBSD.org
+.An Robert Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge, and
-.An "Ben Laurie" Aq benl@FreeBSD.org
+.An Ben Laurie Aq Mt benl@FreeBSD.org
 and
-.An "Kris Kennaway" Aq kris@FreeBSD.org
+.An Kris Kennaway Aq Mt kris@FreeBSD.org
 at Google, Inc., and
-.An "Pawel Jakub Dawidek" Aq pawel@dawidek.net .
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net .
 .Sh BUGS
 .Nm
 is considered experimental in
diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4
index 36a5ab1..6fbbfcf 100644
--- a/share/man/man4/cas.4
+++ b/share/man/man4/cas.4
@@ -152,8 +152,7 @@ and supports the same set of controllers but is otherwise unrelated.
 The
 .Nm
 driver was written by
-.An Marius Strobl
-.Aq marius@FreeBSD.org
+.An Marius Strobl Aq Mt marius@FreeBSD.org
 based on the
 .Xr gem 4
 driver.
diff --git a/share/man/man4/cc_cdg.4 b/share/man/man4/cc_cdg.4
index c111bd4..38f8ed3 100644
--- a/share/man/man4/cc_cdg.4
+++ b/share/man/man4/cc_cdg.4
@@ -145,11 +145,11 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An Grenville Armitage Aq garmitage@swin.edu.au .
+.An Grenville Armitage Aq Mt garmitage@swin.edu.au .
 .Sh BUGS
 The underlying algorithm and parameter values are still a work in progress and
 may not be optimal for some network scenarios.
diff --git a/share/man/man4/cc_chd.4 b/share/man/man4/cc_chd.4
index 39cdef3..963d892 100644
--- a/share/man/man4/cc_chd.4
+++ b/share/man/man4/cc_chd.4
@@ -125,4 +125,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_cubic.4 b/share/man/man4/cc_cubic.4
index 771f264..75df183 100644
--- a/share/man/man4/cc_cubic.4
+++ b/share/man/man4/cc_cubic.4
@@ -109,6 +109,6 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4
index d0acb34..497e616 100644
--- a/share/man/man4/cc_hd.4
+++ b/share/man/man4/cc_hd.4
@@ -117,4 +117,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_htcp.4 b/share/man/man4/cc_htcp.4
index 45d0018..0e141bb 100644
--- a/share/man/man4/cc_htcp.4
+++ b/share/man/man4/cc_htcp.4
@@ -126,11 +126,11 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An James Healy Aq jimmy@deefa.com
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_newreno.4 b/share/man/man4/cc_newreno.4
index fe4c3db..b00f18f 100644
--- a/share/man/man4/cc_newreno.4
+++ b/share/man/man4/cc_newreno.4
@@ -73,10 +73,10 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An James Healy Aq jimmy@deefa.com ,
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An James Healy Aq Mt jimmy@deefa.com ,
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4
index a7397d5..45b4b62 100644
--- a/share/man/man4/cc_vegas.4
+++ b/share/man/man4/cc_vegas.4
@@ -133,4 +133,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index e055e1b..d38a969 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -139,15 +139,15 @@ and
 The
 .Nm
 driver was written by
-.An Craig Boston Aq craig@tobuj.gank.org
+.An Craig Boston Aq Mt craig@tobuj.gank.org
 based on the
 .Xr aue 4
 driver written by
-.An Bill Paul Aq wpaul@windriver.com
+.An Bill Paul Aq Mt wpaul@windriver.com
 and ported to
 .Ox
 by
-.An Daniel Hartmeier Aq dhartmei@openbsd.org .
+.An Daniel Hartmeier Aq Mt dhartmei@openbsd.org .
 .Sh CAVEATS
 Many USB devices notoriously fail to report their class and interfaces
 correctly.
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index d097d54..121199b 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -340,13 +340,13 @@ driver appeared in
 The
 .Nm
 driver was written by
-.An Jason R. Thorpe Aq thorpej@and.com
+.An Jason R. Thorpe Aq Mt thorpej@and.com
 for And Communications,
 .Pa http://www.and.com/ .
 It was added to the system by
-.An Stefan Grefen Aq grefen@goofy.zdv.uni-mainz.de
+.An Stefan Grefen Aq Mt grefen@goofy.zdv.uni-mainz.de
 who apparently had such a device.
 It was ported to CAM by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
 It was updated to support volume tags by
-.An Hans Huebner Aq hans@artcom.de .
+.An Hans Huebner Aq Mt hans@artcom.de .
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index 284944b..f79efe8 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -184,7 +184,7 @@ HP Modular Smart Array 500 (MSA500)
 The
 .Nm
 driver was written by
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page is based on his comments and was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/cm.4 b/share/man/man4/cm.4
index bbeee52..a933918 100644
--- a/share/man/man4/cm.4
+++ b/share/man/man4/cm.4
@@ -145,18 +145,18 @@ The
 device was ported from
 .Nx
 by
-.An Max Khon Aq fjoe@FreeBSD.org
+.An Max Khon Aq Mt fjoe@FreeBSD.org
 and first appeared in
 .Fx 4.6 .
 This 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 .
 The
 .Sx IMPLEMENTATION NOTES
 section was submitted by
-.An Max Khon Aq fjoe@FreeBSD.org
+.An Max Khon Aq Mt fjoe@FreeBSD.org
 and originated from
 .Nx .
 .Sh BUGS
diff --git a/share/man/man4/cmx.4 b/share/man/man4/cmx.4
index 844e6c4..38ae466 100644
--- a/share/man/man4/cmx.4
+++ b/share/man/man4/cmx.4
@@ -103,11 +103,11 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Daniel Roethlisberger Aq daniel@roe.ch ,
+.An Daniel Roethlisberger Aq Mt daniel@roe.ch ,
 originally based on the Linux driver v1.1.0 by
-.An Omnikey GmbH Aq www.omnikey.com .
+.An Omnikey GmbH Lk www.omnikey.com .
 Early testing and bug fixes by
-.An Marcin Cieslak Aq saper@system.pl .
+.An Marcin Cieslak Aq Mt saper@system.pl .
 .Sh BUGS
 .An -nosplit
 The way the
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index efae020..91a9758 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -68,7 +68,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Rui Paulo Aq rpaulo@FreeBSD.org
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
 as part of a Google Summer of Code project.
 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/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4
index 3cc0138..470734b 100644
--- a/share/man/man4/cpuctl.4
+++ b/share/man/man4/cpuctl.4
@@ -188,6 +188,6 @@ driver first appeared in
 The
 .Nm
 module and this manual page were 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/share/man/man4/ctl.4 b/share/man/man4/ctl.4
index 7122a92..51fd0a5 100644
--- a/share/man/man4/ctl.4
+++ b/share/man/man4/ctl.4
@@ -90,4 +90,4 @@ subsystem first appeared in
 The
 .Nm
 subsystem was written by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index a27653c..0ed9e8d 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -110,4 +110,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/cxgb.4 b/share/man/man4/cxgb.4
index 97f72b5..5df049f 100644
--- a/share/man/man4/cxgb.4
+++ b/share/man/man4/cxgb.4
@@ -110,7 +110,7 @@ go to the Chelsio support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq support@chelsio.com .
+.Aq Mt support@chelsio.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -129,6 +129,6 @@ and
 The
 .Nm
 driver was written by
-.An Kip Macy Aq kmacy@FreeBSD.org
+.An Kip Macy Aq Mt kmacy@FreeBSD.org
 with substantial support from
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4
index af6a6a0..215a194 100644
--- a/share/man/man4/cxgbe.4
+++ b/share/man/man4/cxgbe.4
@@ -292,7 +292,7 @@ go to the Chelsio support website at:
 .Pp
 If an issue is identified with this driver with a supported adapter,
 email all the specific information related to the issue to
-.Aq support@chelsio.com .
+.Aq Mt support@chelsio.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -314,4 +314,4 @@ and
 The
 .Nm
 driver was written by
-.An Navdeep Parhar Aq np@FreeBSD.org .
+.An Navdeep Parhar Aq Mt np@FreeBSD.org .
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index cc6250c..ba033cf 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -383,7 +383,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The Macronix application notes claim that in order to put the
 chips in normal operation, the driver must write a certain magic
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 91bb4b4..3f33dd2 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -119,7 +119,7 @@ dcons_gdb="1"
 .Xr dconschat 8 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This driver is
 .Ud
diff --git a/share/man/man4/dcons_crom.4 b/share/man/man4/dcons_crom.4
index b9c5ca0..eca479d 100644
--- a/share/man/man4/dcons_crom.4
+++ b/share/man/man4/dcons_crom.4
@@ -51,7 +51,7 @@ This address is supposed to be used by
 .Xr dconschat 8 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 If you load
 .Pa dcons_crom.ko
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index d22275e..d829699 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -175,7 +175,7 @@ that was not associated with any interface.
 .Xr ipfw 4 ,
 .Xr ipfw 8
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org ,
+.An Archie Cobbs Aq Mt archie@FreeBSD.org ,
 Whistle Communications Corp.
 .Sh BUGS
 This is an attempt to provide a clean way for user mode processes
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index a5d0e6c..65571b3 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -69,7 +69,7 @@ facility
 was initially implemented as a testing tool for
 .Tn TCP
 congestion control by
-.An Luigi Rizzo Aq luigi@iet.unipi.it ,
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it ,
 as described on ACM Computer Communication Review, Jan.97 issue.
 Later it has been modified to work at the
 .Tn IP
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 9c95286..ab50ab1 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -260,7 +260,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -280,7 +280,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
 .Sh BUGS
 Hardware-assisted VLAN processing is disabled by default.
 You can enable it on an
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index 6ebc85b..ccb574c 100644
--- a/share/man/man4/esp.4
+++ b/share/man/man4/esp.4
@@ -102,11 +102,9 @@ The
 driver was ported to
 .Fx
 by
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 and later on considerably improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/est.4 b/share/man/man4/est.4
index 4d230e0..0dc4922 100644
--- a/share/man/man4/est.4
+++ b/share/man/man4/est.4
@@ -117,4 +117,4 @@ is only found on supported Intel CPUs.
 .Re
 .Sh AUTHORS
 This manual page was written by
-.An Sean Bruno Aq sbruno@FreeBSD.org .
+.An Sean Bruno Aq Mt sbruno@FreeBSD.org .
diff --git a/share/man/man4/et.4 b/share/man/man4/et.4
index 9b99470..7a0a92e 100644
--- a/share/man/man4/et.4
+++ b/share/man/man4/et.4
@@ -177,10 +177,10 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Sepherosa Ziehau Aq sepherosa@gmail.com
+.An Sepherosa Ziehau Aq Mt sepherosa@gmail.com
 for
 .Dx .
 It was ported to
 .Fx
 by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man4/fatm.4 b/share/man/man4/fatm.4
index 51dc6fc..c59ff33 100644
--- a/share/man/man4/fatm.4
+++ b/share/man/man4/fatm.4
@@ -103,7 +103,7 @@ fatm0: <FORE PCA200E> mem 0xd5800000-0xd59fffff irq 9 at device 9.0 on pci0
 .Xr natmip 4 ,
 .Xr utopia 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh BUGS
 These cards can CBR shape a single VCC only.
 It is currently possible to
diff --git a/share/man/man4/ffclock.4 b/share/man/man4/ffclock.4
index 9110c16..992610d 100644
--- a/share/man/man4/ffclock.4
+++ b/share/man/man4/ffclock.4
@@ -118,12 +118,12 @@ Feed-forward clock support first appeared in
 .Sh AUTHORS
 .An -nosplit
 The feed-forward clock support was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 in collaboration with
-.An Darryl Veitch Aq dveitch@unimelb.edu.au
+.An Darryl Veitch Aq Mt dveitch@unimelb.edu.au
 at the University of Melbourne under sponsorship from the FreeBSD Foundation.
 .Pp
 This manual page was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/full.4 b/share/man/man4/full.4
index a71eb92..1cd3f1a 100644
--- a/share/man/man4/full.4
+++ b/share/man/man4/full.4
@@ -44,4 +44,4 @@ However, it will always be full when writing to it.
 .Xr zero 4
 .Sh Author
 This device and man page was written by
-.An Eitan Adler Aq eadler@FreeBSD.org .
+.An Eitan Adler Aq Mt eadler@FreeBSD.org .
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index 2b868e5..ada7997 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -301,4 +301,4 @@ under DARPA/SPAWAR contract N66001-01-C-8035
 as part of the
 DARPA CHATS research program.
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index f81ef40..dc73382 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -578,7 +578,7 @@ message to remind you to remove it again.
 .Xr kldload 8
 .Sh AUTHORS
 This man page was written by
-.An "Greg Lehey" Aq grog@FreeBSD.org .
+.An Greg Lehey Aq Mt grog@FreeBSD.org .
 .Sh BUGS
 The
 .Xr gdb 1
diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4
index e4ebeb0..44e0625 100644
--- a/share/man/man4/gem.4
+++ b/share/man/man4/gem.4
@@ -133,16 +133,12 @@ The
 driver was written for
 .Nx
 by
-.An Eduardo Horvath
-.Aq eeh@NetBSD.org .
+.An Eduardo Horvath Aq Mt eeh@NetBSD.org .
 It was ported to
 .Fx
 by
-.An Thomas Moestl
-.Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 and later on improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 The man page was written by
-.An Thomas Klausner
-.Aq wiz@NetBSD.org .
+.An Thomas Klausner Aq Mt wiz@NetBSD.org .
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 3cfc283..c881f47 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -481,4 +481,4 @@ in
 .Fx
 never succeeded.
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4
index 8010d24..55d84f1 100644
--- a/share/man/man4/geom_fox.4
+++ b/share/man/man4/geom_fox.4
@@ -181,9 +181,9 @@ da2.fox     N/A  da2
 The
 .Nm
 driver was written by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An "Wilko Bulte" Aq wilko@FreeBSD.org .
+.An Wilko Bulte Aq Mt wilko@FreeBSD.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/geom_linux_lvm.4 b/share/man/man4/geom_linux_lvm.4
index 7dee047..2e1c8aa 100644
--- a/share/man/man4/geom_linux_lvm.4
+++ b/share/man/man4/geom_linux_lvm.4
@@ -85,4 +85,4 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Andrew Thompson" Aq thompsa@FreeBSD.org .
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org .
diff --git a/share/man/man4/geom_map.4 b/share/man/man4/geom_map.4
index 6af91be..51b15c7 100644
--- a/share/man/man4/geom_map.4
+++ b/share/man/man4/geom_map.4
@@ -208,4 +208,4 @@ hint.map.5.name="config"
 The
 .Nm
 driver was written by
-.An "Aleksandr Rybalko" Aq ray@ddteam.net .
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net .
diff --git a/share/man/man4/geom_uncompress.4 b/share/man/man4/geom_uncompress.4
index 6e848d4..0682c69 100644
--- a/share/man/man4/geom_uncompress.4
+++ b/share/man/man4/geom_uncompress.4
@@ -100,8 +100,8 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Maxim Sobolev" Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
 and
-.An "Aleksandr Rybalko" Aq ray@FreeBSD.org .
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
 This manual page was written by
-.An "Luiz Otavio O Souza" Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/geom_uzip.4 b/share/man/man4/geom_uzip.4
index 8d27673..3344f8f 100644
--- a/share/man/man4/geom_uzip.4
+++ b/share/man/man4/geom_uzip.4
@@ -100,6 +100,6 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Max Khon" Aq fjoe@FreeBSD.org .
+.An Max Khon Aq Mt fjoe@FreeBSD.org .
 This manual page was written by
-.An "Ceri Davies" Aq ceri@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org .
diff --git a/share/man/man4/gpio.4 b/share/man/man4/gpio.4
index 119f938..0e2c8cd 100644
--- a/share/man/man4/gpio.4
+++ b/share/man/man4/gpio.4
@@ -142,4 +142,4 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Sean Bruno Aq sbruno@FreeBSD.org .
+.An Sean Bruno Aq Mt sbruno@FreeBSD.org .
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index a9267c9..72bb510 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -306,7 +306,7 @@ A description of GRE encapsulation can be found in RFC 1701 and RFC 1702.
 .Pp
 A description of MOBILE encapsulation can be found in RFC 2004.
 .Sh AUTHORS
-.An Heiko W.Rupp Aq hwr@pilhuhn.de
+.An Heiko W.Rupp Aq Mt hwr@pilhuhn.de
 .Sh BUGS
 The
 .Fn compute_route
diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4
index 3dbedab..84b68a6 100644
--- a/share/man/man4/h_ertt.4
+++ b/share/man/man4/h_ertt.4
@@ -135,7 +135,7 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 Khelp module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Sh BUGS
 The module maintains enhanced RTT estimates for all new TCP connections created
 after the time at which the module was loaded.
diff --git a/share/man/man4/hatm.4 b/share/man/man4/hatm.4
index 59de800..e6e1714 100644
--- a/share/man/man4/hatm.4
+++ b/share/man/man4/hatm.4
@@ -264,7 +264,7 @@ hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
 .Xr ifconfig 8 ,
 .Xr route 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 When putting a HE155 into a 64-bit 66MHz PCI slot the machine may hang.
 This occurs very early in the POST so that even the display does not turn on.
diff --git a/share/man/man4/hme.4 b/share/man/man4/hme.4
index 2bdc72a..f75ee45 100644
--- a/share/man/man4/hme.4
+++ b/share/man/man4/hme.4
@@ -147,5 +147,4 @@ version to include it was
 The
 .Nm
 driver was written by
-.An Paul Kranenburg
-.Aq pk@NetBSD.org .
+.An Paul Kranenburg Aq Mt pk@NetBSD.org .
diff --git a/share/man/man4/hpt27xx.4 b/share/man/man4/hpt27xx.4
index 01f9ba5..4ad5eaf 100644
--- a/share/man/man4/hpt27xx.4
+++ b/share/man/man4/hpt27xx.4
@@ -97,5 +97,5 @@ The
 device driver was written by
 .An HighPoint Technologies, Inc. .
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/hptnr.4 b/share/man/man4/hptnr.4
index e441b3a..47b6918 100644
--- a/share/man/man4/hptnr.4
+++ b/share/man/man4/hptnr.4
@@ -88,5 +88,5 @@ The
 device driver was written by
 .An HighPoint Technologies, Inc. .
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/hv_ata_pci_disengage.4 b/share/man/man4/hv_ata_pci_disengage.4
index b8699f7..2123e8b 100644
--- a/share/man/man4/hv_ata_pci_disengage.4
+++ b/share/man/man4/hv_ata_pci_disengage.4
@@ -87,4 +87,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_kvp.4 b/share/man/man4/hv_kvp.4
index afd3e32..269eef7 100644
--- a/share/man/man4/hv_kvp.4
+++ b/share/man/man4/hv_kvp.4
@@ -93,4 +93,4 @@ Incorporated, Microsoft Corporation and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_netvsc.4 b/share/man/man4/hv_netvsc.4
index ed04e9d..31325bb 100644
--- a/share/man/man4/hv_netvsc.4
+++ b/share/man/man4/hv_netvsc.4
@@ -80,4 +80,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_storvsc.4 b/share/man/man4/hv_storvsc.4
index 57b6127..54805f1 100644
--- a/share/man/man4/hv_storvsc.4
+++ b/share/man/man4/hv_storvsc.4
@@ -86,4 +86,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_utils.4 b/share/man/man4/hv_utils.4
index 844e599..82439ea 100644
--- a/share/man/man4/hv_utils.4
+++ b/share/man/man4/hv_utils.4
@@ -82,4 +82,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_vmbus.4 b/share/man/man4/hv_vmbus.4
index 873cb28e..daafd5d 100644
--- a/share/man/man4/hv_vmbus.4
+++ b/share/man/man4/hv_vmbus.4
@@ -90,4 +90,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index b0c3930..5777cdd 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -780,8 +780,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 .Sh BUGS
 The driver samples the state of the kernel's logical processor support
 at the time of initialization (i.e., at module load time).
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index a415941..5fded27 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -54,4 +54,4 @@ device contained in the Intel 82801AA (ICH), 82801AB (ICH0),
 .Xr smb 4 ,
 .Xr smbus 4
 .Sh AUTHORS
-.An Archie L. Cobbs Aq archie@FreeBSD.org
+.An Archie L. Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4
index 25b6dbb..35a5f7f 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -83,8 +83,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Wm. Daryl Hawkins Aq dhawkins@tamu.edu
+.An Wm. Daryl Hawkins Aq Mt dhawkins@tamu.edu
 of Texas A&M University and
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@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/share/man/man4/ida.4 b/share/man/man4/ida.4
index 01e0267..52f4bf2 100644
--- a/share/man/man4/ida.4
+++ b/share/man/man4/ida.4
@@ -77,8 +77,8 @@ Pass-through should only be used to a device that is otherwise quiescent.
 The
 .Nm
 driver was written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org
 and
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4
index 5c857c8..cd916b0 100644
--- a/share/man/man4/igb.4
+++ b/share/man/man4/igb.4
@@ -205,7 +205,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -225,4 +225,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index a7608b2..d9e4309 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -69,9 +69,9 @@ The
 .Nm
 driver is supported and maintained by
 .An -nosplit
-.An Achim Leubner Aq Achim_Leubner@adaptec.com .
+.An Achim Leubner Aq Mt Achim_Leubner@adaptec.com .
 .Pp
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and is based on information supplied by the driver authors and the website of
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 5e015a8..c9cf47e 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -54,7 +54,7 @@ driver first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Takanori Watanabe Aq takawata@shidahara1.planet.sci.kobe-u.ac.jp .
+.An Takanori Watanabe Aq Mt takawata@shidahara1.planet.sci.kobe-u.ac.jp .
 .Sh BUGS
 This device requires IRQ 9 exclusively.
 To use this, you should enable
diff --git a/share/man/man4/ipmi.4 b/share/man/man4/ipmi.4
index 25dc341..9516d31 100644
--- a/share/man/man4/ipmi.4
+++ b/share/man/man4/ipmi.4
@@ -192,9 +192,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Doug Ambrisko Aq ambrisko@FreeBSD.org .
+.An Doug Ambrisko Aq Mt ambrisko@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 Not all features of the MontaVista driver are supported.
 .Pp
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 0a38d5b..b22b91c 100644
--- a/share/man/man4/ips.4
+++ b/share/man/man4/ips.4
@@ -198,7 +198,7 @@ driver was written by
 .An -nosplit
 .An David Jefferys
 and
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 9becdfa..9dfbd6d 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -152,4 +152,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4
index 1d9353d..06e249b 100644
--- a/share/man/man4/isci.4
+++ b/share/man/man4/isci.4
@@ -105,9 +105,11 @@ and 9.1.
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org
-with contributions from Sohaib Ahsan and input from
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org
+with contributions from
+.An Sohaib Ahsan
+and input from
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/ismt.4 b/share/man/man4/ismt.4
index 15baf4b..63a3952 100644
--- a/share/man/man4/ismt.4
+++ b/share/man/man4/ismt.4
@@ -56,4 +56,4 @@ The
 driver first appeared in
 .Fx 11.0 .
 .Sh AUTHORS
-.An Jim Harris Aq jimharris@FreeBSD.org
+.An Jim Harris Aq Mt jimharris@FreeBSD.org
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 97ff634..683f496 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -157,4 +157,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index f489321..0a824e7 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -192,4 +192,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/ixgb.4 b/share/man/man4/ixgb.4
index 59d1648..b1e9af3 100644
--- a/share/man/man4/ixgb.4
+++ b/share/man/man4/ixgb.4
@@ -102,7 +102,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr em 4 ,
@@ -122,4 +122,4 @@ and
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/ixgbe.4 b/share/man/man4/ixgbe.4
index be056d3..99c1cc7 100644
--- a/share/man/man4/ixgbe.4
+++ b/share/man/man4/ixgbe.4
@@ -105,7 +105,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -123,4 +123,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4
index e17a797..513c253 100644
--- a/share/man/man4/jme.4
+++ b/share/man/man4/jme.4
@@ -165,8 +165,7 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
 .Sh CAVEATS
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index 4de2f5a..566dc73 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -116,4 +116,4 @@ The
 driver appeared in
 .Fx 2.0.5 .
 .Sh AUTHORS
-.An Jean-Marc Zucconi Aq jmz@cabri.obs-besancon.fr
+.An Jean-Marc Zucconi Aq Mt jmz@cabri.obs-besancon.fr
diff --git a/share/man/man4/kbdmux.4 b/share/man/man4/kbdmux.4
index 72b5889..a909ba9 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -41,7 +41,7 @@ The
 module was implemented in
 .Fx 6.0 .
 .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/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index 8cff292..4a71aa3 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -167,4 +167,4 @@ The
 .Xr kbdcontrol 1
 utility also allows changing these values at runtime.
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index de991c4..185389a 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -146,7 +146,7 @@ facility provided by
 The
 .Nm
 facility was originally implemented by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 .Sh BUGS
 If a module B, is dependent on another module A, but is not compiled with
 module A as a dependency, then
diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4
index 5c1dae0..6ce42ea 100644
--- a/share/man/man4/ksyms.4
+++ b/share/man/man4/ksyms.4
@@ -130,8 +130,7 @@ to support
 The
 .Nm
 driver was written by
-.An Stacey Son
-.Aq sson@FreeBSD.org .
+.An Stacey Son Aq Mt sson@FreeBSD.org .
 .Sh BUGS
 Because files can be dynamically linked into the kernel at any time the symbol
 information can vary.  When you open the
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index c9a8ad7..c535319 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -134,7 +134,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index bb2cfc6..392f5f7 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -190,7 +190,7 @@ The
 driver was written under the name
 .Nm trunk
 by
-.An Reyk Floeter Aq reyk@openbsd.org .
+.An Reyk Floeter Aq Mt reyk@openbsd.org .
 The LACP implementation was written by
 .An YAMAMOTO Takashi
 for
diff --git a/share/man/man4/le.4 b/share/man/man4/le.4
index 0a1823d..0316e46 100644
--- a/share/man/man4/le.4
+++ b/share/man/man4/le.4
@@ -427,7 +427,7 @@ driver which first appeared in
 The
 .Nm
 driver was ported by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .\" .Sh BUGS
 .\" The Am7990 Revision C chips have a bug which causes garbage to be inserted
 .\" in front of the received packet occasionally.
diff --git a/share/man/man4/led.4 b/share/man/man4/led.4
index b31a083..0fe4af0 100644
--- a/share/man/man4/led.4
+++ b/share/man/man4/led.4
@@ -182,12 +182,9 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This software was written by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Sergey A. Osokin
-.Aq osa@FreeBSD.org
+.An Sergey A. Osokin Aq Mt osa@FreeBSD.org
 and
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index 89510f2..734eb4a 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -154,4 +154,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq william.paul@windriver.com .
+.An Bill Paul Aq Mt william.paul@windriver.com .
diff --git a/share/man/man4/lm75.4 b/share/man/man4/lm75.4
index 8e794dc..d137eb0 100644
--- a/share/man/man4/lm75.4
+++ b/share/man/man4/lm75.4
@@ -188,4 +188,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4
index ee29aee..e07875a 100644
--- a/share/man/man4/lmc.4
+++ b/share/man/man4/lmc.4
@@ -761,4 +761,4 @@ rewrote everything and now feels responsible for it.
 .\"
 .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/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4
index 23b89c0..ca02962 100644
--- a/share/man/man4/mac_bsdextended.4
+++ b/share/man/man4/mac_bsdextended.4
@@ -139,7 +139,7 @@ and was developed by the
 Project.
 .Pp
 The "match first case" and logging capabilities were later added by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh AUTHORS
 This software was contributed to the
 .Fx
diff --git a/share/man/man4/man4.arm/ti_adc.4 b/share/man/man4/man4.arm/ti_adc.4
index aa80016..7c70c27 100644
--- a/share/man/man4/man4.arm/ti_adc.4
+++ b/share/man/man4/man4.arm/ti_adc.4
@@ -125,4 +125,4 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 The driver and this manual page was written by
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/CPU_ELAN.4 b/share/man/man4/man4.i386/CPU_ELAN.4
index 4a0611f..5405743 100644
--- a/share/man/man4/man4.i386/CPU_ELAN.4
+++ b/share/man/man4/man4.i386/CPU_ELAN.4
@@ -156,4 +156,4 @@ The
 code first appeared in
 .Fx 4.7 .
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/man4.i386/ct.4 b/share/man/man4/man4.i386/ct.4
index ac8d6c2..28208a1 100644
--- a/share/man/man4/man4.i386/ct.4
+++ b/share/man/man4/man4.i386/ct.4
@@ -150,13 +150,13 @@ and ported for
 It first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
 .An Naofumi HONDA .
 .Pp
 This manual page was written by
-.An -nosplit
-.An Noriaki MITSUNAGA Aq non@FreeBSD.org
+.An Noriaki MITSUNAGA Aq Mt non@FreeBSD.org
 and
-.An Hideyuki KURASHINA Aq rushani@FreeBSD.org .
+.An Hideyuki KURASHINA Aq Mt rushani@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 22bbf2a..b313edb 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -259,7 +259,7 @@ driver appeared in
 The
 .Nm
 driver was originally written and contributed by
-.An M. Sekiguchi Aq seki@sysrap.cs.fujitsu.co.jp ,
+.An M. Sekiguchi Aq Mt seki@sysrap.cs.fujitsu.co.jp ,
 following the
 .Nm ed
 driver written by
@@ -267,7 +267,7 @@ driver written by
 PC card support in
 .Nm
 is written by
-.An Hidetoshi Kimura Aq h-kimura@tokyo.se.fujitsu.co.jp .
+.An Hidetoshi Kimura Aq Mt h-kimura@tokyo.se.fujitsu.co.jp .
 This manual page was written by
 .An M. Sekiguchi .
 .Pp
diff --git a/share/man/man4/man4.i386/glxiic.4 b/share/man/man4/man4.i386/glxiic.4
index 30d3ffe..2f259d1 100644
--- a/share/man/man4/man4.i386/glxiic.4
+++ b/share/man/man4/man4.i386/glxiic.4
@@ -103,4 +103,4 @@ device driver and manual page first appeared in
 The
 .Nm
 device driver and manual page were written by
-.An Henrik Brix Andersen Aq brix@FreeBSD.org .
+.An Henrik Brix Andersen Aq Mt brix@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/glxsb.4 b/share/man/man4/man4.i386/glxsb.4
index fb2669f..a77b475 100644
--- a/share/man/man4/man4.i386/glxsb.4
+++ b/share/man/man4/man4.i386/glxsb.4
@@ -94,4 +94,4 @@ by
 It was ported to
 .Fx
 by
-.An Patrick Lamaiziere Aq patfbsd@davenulle.org .
+.An Patrick Lamaiziere Aq Mt patfbsd@davenulle.org .
diff --git a/share/man/man4/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index b9bfc66..865bb8d 100644
--- a/share/man/man4/man4.i386/longrun.4
+++ b/share/man/man4/man4.i386/longrun.4
@@ -62,6 +62,6 @@ The Transmeta(TM) Crusoe(TM) LongRun(TM) support first appeared in
 .Sh AUTHORS
 .An -nosplit
 LongRun support and this manual page were written by
-.An Tamotsu HATTORI Aq athlete@kta.att.ne.jp
+.An Tamotsu HATTORI Aq Mt athlete@kta.att.ne.jp
 and
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org .
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/pae.4 b/share/man/man4/man4.i386/pae.4
index 718e2b2..55c2aa6 100644
--- a/share/man/man4/man4.i386/pae.4
+++ b/share/man/man4/man4.i386/pae.4
@@ -69,7 +69,7 @@ option first appeared in
 and
 .Fx 5.1 .
 .Sh AUTHORS
-.An Jake Burkholder Aq jake@FreeBSD.org
+.An Jake Burkholder Aq Mt jake@FreeBSD.org
 .Sh BUGS
 Since KLD modules are not compiled with the same options headers that
 the kernel is compiled with,
diff --git a/share/man/man4/man4.i386/pbio.4 b/share/man/man4/man4.i386/pbio.4
index f4fbf3b..d04eb32 100644
--- a/share/man/man4/man4.i386/pbio.4
+++ b/share/man/man4/man4.i386/pbio.4
@@ -179,7 +179,7 @@ The
 device was first used under
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Diomidis D. Spinellis" Aq dds@aueb.gr
+.An Diomidis D. Spinellis Aq Mt dds@aueb.gr
 .Sh BUGS
 One of the
 .Tn PCL-724
diff --git a/share/man/man4/man4.i386/smapi.4 b/share/man/man4/man4.i386/smapi.4
index 8af17fa..116c401 100644
--- a/share/man/man4/man4.i386/smapi.4
+++ b/share/man/man4/man4.i386/smapi.4
@@ -146,8 +146,8 @@ Finally a length field which is comprised of Byte, Word, or Double Word.
 The
 .Nm
 driver was written by
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/snc.4 b/share/man/man4/man4.i386/snc.4
index 66b4524..6f82690 100644
--- a/share/man/man4/man4.i386/snc.4
+++ b/share/man/man4/man4.i386/snc.4
@@ -122,16 +122,16 @@ driver was ported from
 .Nx
 by
 .An -nosplit
-.An Motomichi Matsuzaki Aq mzaki@e-mail.ne.jp
+.An Motomichi Matsuzaki Aq Mt mzaki@e-mail.ne.jp
 and
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp .
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp .
 It first appeared in
 .Fx 4.2 .
 This 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
 Currently the
 .Nm
diff --git a/share/man/man4/man4.i386/vpd.4 b/share/man/man4/man4.i386/vpd.4
index 7ed2063..ba7acd4 100644
--- a/share/man/man4/man4.i386/vpd.4
+++ b/share/man/man4/man4.i386/vpd.4
@@ -87,4 +87,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index ab0472b..e3c1ae4 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -114,7 +114,7 @@ driver, from which it inherits most of its limitations.
 The
 .Nm
 device driver and this manual page were written by
-.An Fred Gray Aq fgray@rice.edu ,
+.An Fred Gray Aq Mt fgray@rice.edu ,
 based on the work of
 .An Herb Peyerl
 and with the assistance of numerous others.
diff --git a/share/man/man4/man4.powerpc/adb.4 b/share/man/man4/man4.powerpc/adb.4
index eb34eca..05a17a4 100644
--- a/share/man/man4/man4.powerpc/adb.4
+++ b/share/man/man4/man4.powerpc/adb.4
@@ -66,5 +66,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/akbd.4 b/share/man/man4/man4.powerpc/akbd.4
index e56676a..2ecaaef 100644
--- a/share/man/man4/man4.powerpc/akbd.4
+++ b/share/man/man4/man4.powerpc/akbd.4
@@ -101,5 +101,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/ams.4 b/share/man/man4/man4.powerpc/ams.4
index 15560cf..00ce975 100644
--- a/share/man/man4/man4.powerpc/ams.4
+++ b/share/man/man4/man4.powerpc/ams.4
@@ -83,5 +83,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4
index 9d6a029..850d307 100644
--- a/share/man/man4/man4.powerpc/bm.4
+++ b/share/man/man4/man4.powerpc/bm.4
@@ -80,8 +80,6 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 based on work by
-.An Peter Grehan
-.Aq grehan@FreeBSD.org .
+.An Peter Grehan Aq Mt grehan@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/cuda.4 b/share/man/man4/man4.powerpc/cuda.4
index f1faaf2..021b6a1 100644
--- a/share/man/man4/man4.powerpc/cuda.4
+++ b/share/man/man4/man4.powerpc/cuda.4
@@ -72,8 +72,8 @@ and then in
 The
 .Nm
 driver was written by
-.An Michael Lorenz
-.Aq macallan@NetBSD.org
-and ported to FreeBSD by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Michael Lorenz Aq Mt macallan@NetBSD.org
+and ported to
+.Fx
+by
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/pmu.4 b/share/man/man4/man4.powerpc/pmu.4
index ab99877..30b2762 100644
--- a/share/man/man4/man4.powerpc/pmu.4
+++ b/share/man/man4/man4.powerpc/pmu.4
@@ -109,8 +109,8 @@ and then in
 The
 .Nm
 driver was written by
-.An Michael Lorenz
-.Aq macallan@NetBSD.org
-and ported to FreeBSD by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Michael Lorenz Aq Mt macallan@NetBSD.org
+and ported to
+.Fx
+by
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/powermac_nvram.4 b/share/man/man4/man4.powerpc/powermac_nvram.4
index 9aae920..9547bc8 100644
--- a/share/man/man4/man4.powerpc/powermac_nvram.4
+++ b/share/man/man4/man4.powerpc/powermac_nvram.4
@@ -62,4 +62,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Maxim Sobolev Aq sobomax@FreeBSD.org .
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/smu.4 b/share/man/man4/man4.powerpc/smu.4
index 2550a0d..2e10160 100644
--- a/share/man/man4/man4.powerpc/smu.4
+++ b/share/man/man4/man4.powerpc/smu.4
@@ -121,5 +121,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4
index 472a518..9356600 100644
--- a/share/man/man4/man4.powerpc/snd_ai2s.4
+++ b/share/man/man4/man4.powerpc/snd_ai2s.4
@@ -79,10 +79,10 @@ and then in
 The
 .Nm
 driver was written by
-.An Tsubai Masanari
-.Aq tsubai@netbsd.org ,
-and ported to FreeBSD by
-.An Marco Trillo
-.Aq marcotrillo@gmail.com .
+.An Tsubai Masanari Aq Mt tsubai@netbsd.org ,
+and ported to
+.Fx
+by
+.An Marco Trillo Aq Mt marcotrillo@gmail.com .
 .Sh BUGS
 Recording and operation with non-44.1 Khz audio are not currently supported.
diff --git a/share/man/man4/man4.powerpc/snd_davbus.4 b/share/man/man4/man4.powerpc/snd_davbus.4
index e220de2..9949f9b8 100644
--- a/share/man/man4/man4.powerpc/snd_davbus.4
+++ b/share/man/man4/man4.powerpc/snd_davbus.4
@@ -75,7 +75,6 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Marco Trillo
-.Aq marcotrillo@gmail.com .
+.An Marco Trillo Aq Mt marcotrillo@gmail.com .
 .Sh BUGS
 Recording is not currently supported.
diff --git a/share/man/man4/man4.sparc64/auxio.4 b/share/man/man4/man4.sparc64/auxio.4
index fb3cdbd..9c5bbe1 100644
--- a/share/man/man4/man4.sparc64/auxio.4
+++ b/share/man/man4/man4.sparc64/auxio.4
@@ -77,4 +77,4 @@ driver was written by
 and ported to
 .Fx
 by
-.An Pyun YongHyeon Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/central.4 b/share/man/man4/man4.sparc64/central.4
index 3fa09bd..fcde31d 100644
--- a/share/man/man4/man4.sparc64/central.4
+++ b/share/man/man4/man4.sparc64/central.4
@@ -57,4 +57,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/clkbrd.4 b/share/man/man4/man4.sparc64/clkbrd.4
index ad74ee2..677648f 100644
--- a/share/man/man4/man4.sparc64/clkbrd.4
+++ b/share/man/man4/man4.sparc64/clkbrd.4
@@ -79,10 +79,10 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Jason L. Wright"
+.An Jason L. Wright
 and ported to
 .Fx
 by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .Sh CAVEATS
 Hardware management functionality is not implemented.
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 5d7205b..64035a7 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -79,7 +79,7 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org
+.An Jake Burkholder Aq Mt jake@FreeBSD.org
 roughly based on the
 .Ox
 driver written by
diff --git a/share/man/man4/man4.sparc64/ebus.4 b/share/man/man4/man4.sparc64/ebus.4
index 2dd9807..26b6744 100644
--- a/share/man/man4/man4.sparc64/ebus.4
+++ b/share/man/man4/man4.sparc64/ebus.4
@@ -115,8 +115,8 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Matthew R. Green"
+.An Matthew R. Green
 and ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/eeprom.4 b/share/man/man4/man4.sparc64/eeprom.4
index 58af4e8..8d7c3a5 100644
--- a/share/man/man4/man4.sparc64/eeprom.4
+++ b/share/man/man4/man4.sparc64/eeprom.4
@@ -123,8 +123,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 based on the
 .Nx
 sparc64 clock code written by
-.An "Paul Kranenburg" .
+.An Paul Kranenburg .
diff --git a/share/man/man4/man4.sparc64/fhc.4 b/share/man/man4/man4.sparc64/fhc.4
index 3787370..1cd12e9 100644
--- a/share/man/man4/man4.sparc64/fhc.4
+++ b/share/man/man4/man4.sparc64/fhc.4
@@ -79,4 +79,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/machfb.4 b/share/man/man4/man4.sparc64/machfb.4
index c42eb9b..9e65222 100644
--- a/share/man/man4/man4.sparc64/machfb.4
+++ b/share/man/man4/man4.sparc64/machfb.4
@@ -171,10 +171,10 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Marius Strobl" Aq marius@FreeBSD.org
+.An Marius Strobl Aq Mt marius@FreeBSD.org
 based on the
 .Nx
 driver written by
-.An "Bang Jun-Young" .
+.An Bang Jun-Young .
 .Sh CAVEATS
 Font loading and mode switching are not implemented.
diff --git a/share/man/man4/man4.sparc64/ofw_console.4 b/share/man/man4/man4.sparc64/ofw_console.4
index 9a4513b..f21b977 100644
--- a/share/man/man4/man4.sparc64/ofw_console.4
+++ b/share/man/man4/man4.sparc64/ofw_console.4
@@ -93,7 +93,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Benno Rice" Aq benno@FreeBSD.org .
+.An Benno Rice Aq Mt benno@FreeBSD.org .
 .Sh CAVEATS
 Since the Open Firmware will handle BREAK
 (or Stop-A)
diff --git a/share/man/man4/man4.sparc64/openfirm.4 b/share/man/man4/man4.sparc64/openfirm.4
index 4b6bde7..bee4915 100644
--- a/share/man/man4/man4.sparc64/openfirm.4
+++ b/share/man/man4/man4.sparc64/openfirm.4
@@ -278,7 +278,7 @@ The
 interface was ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
 .Sh CAVEATS
 Due to limitations within
 .Tn Open Firmware
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index 38a2291..8acdb14 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -222,7 +222,7 @@ interface was
 The
 .Nm
 interface was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 .Sh CAVEATS
 Due to limitations within
 .Tn Open Firmware
diff --git a/share/man/man4/man4.sparc64/rtc.4 b/share/man/man4/man4.sparc64/rtc.4
index 9117bf3..34bd865 100644
--- a/share/man/man4/man4.sparc64/rtc.4
+++ b/share/man/man4/man4.sparc64/rtc.4
@@ -85,4 +85,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/sbus.4 b/share/man/man4/man4.sparc64/sbus.4
index 7955727..17ab18d 100644
--- a/share/man/man4/man4.sparc64/sbus.4
+++ b/share/man/man4/man4.sparc64/sbus.4
@@ -72,8 +72,8 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Paul Kranenburg"
+.An Paul Kranenburg
 and ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/snd_audiocs.4 b/share/man/man4/man4.sparc64/snd_audiocs.4
index 5fcc44a..13b4c22 100644
--- a/share/man/man4/man4.sparc64/snd_audiocs.4
+++ b/share/man/man4/man4.sparc64/snd_audiocs.4
@@ -80,8 +80,7 @@ device driver first appeared in
 The
 .Nm
 driver was ported by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org
 from the
 .Ox
 driver written by
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 49b0069..af91e58 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -110,5 +110,4 @@ driver in
 The
 .Nm
 driver was written by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4
index 77765de..c938173 100644
--- a/share/man/man4/meteor.4
+++ b/share/man/man4/meteor.4
@@ -865,8 +865,8 @@ invalid meteor_counts structure pointer.
 .El
 .El
 .Sh AUTHORS
-.An Jim Lowe Aq james@miller.cs.uwm.edu ,
-.An Mark Tinguely Aq tinguely@plains.nodak.edu
+.An Jim Lowe Aq Mt james@miller.cs.uwm.edu
+.An Mark Tinguely Aq Mt tinguely@plains.nodak.edu
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/mfi.4 b/share/man/man4/mfi.4
index a6d6278..c20d9bd 100644
--- a/share/man/man4/mfi.4
+++ b/share/man/man4/mfi.4
@@ -143,6 +143,6 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Sh BUGS
 The driver does not support big-endian architectures at this time.
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index 2affa56..6152095 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -185,4 +185,4 @@ driver first appeared in
 .Fx 3.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/mk48txx.4 b/share/man/man4/mk48txx.4
index 303ccc9..3038593 100644
--- a/share/man/man4/mk48txx.4
+++ b/share/man/man4/mk48txx.4
@@ -216,13 +216,10 @@ The
 driver was written for
 .Nx
 by
-.An Paul Kranenburg
-.Aq pk@NetBSD.org .
+.An Paul Kranenburg Aq Mt pk@NetBSD.org .
 It was ported to
 .Fx
 by
-.An Thomas Moestl
-.Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 and later on improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
diff --git a/share/man/man4/mlx.4 b/share/man/man4/mlx.4
index 696d048..332a5f9 100644
--- a/share/man/man4/mlx.4
+++ b/share/man/man4/mlx.4
@@ -238,15 +238,12 @@ or in the driver.
 The
 .Nm
 driver was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 and
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The driver does not yet support EISA adapters.
 The DEC KZPSC has insufficient flash ROM to hold any reasonably recent firmware.
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 3affcac..0a70176 100644
--- a/share/man/man4/mly.4
+++ b/share/man/man4/mly.4
@@ -260,12 +260,10 @@ These events report controller status changes.
 The
 .Nm
 driver was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The driver does not yet provide an external management interface.
 .Pp
diff --git a/share/man/man4/mn.4 b/share/man/man4/mn.4
index 0b88f2f..aac7f96 100644
--- a/share/man/man4/mn.4
+++ b/share/man/man4/mn.4
@@ -52,4 +52,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/mod_cc.4 b/share/man/man4/mod_cc.4
index 204537f..4b08a6d 100644
--- a/share/man/man4/mod_cc.4
+++ b/share/man/man4/mod_cc.4
@@ -106,12 +106,12 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 facility was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org ,
-.An James Healy Aq jimmy@deefa.com
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org ,
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index 816936a..1cf7aa2 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -400,4 +400,4 @@ USB mouse device
 .\".Sh HISTORY
 .Sh AUTHORS
 This manual page was written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/mpr.4 b/share/man/man4/mpr.4
index 4a42fa1..c85be67 100644
--- a/share/man/man4/mpr.4
+++ b/share/man/man4/mpr.4
@@ -220,10 +220,10 @@ The
 .Nm
 driver was originally written by
 .An -nosplit
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 It has been improved and tested by LSI Corporation.
 .Pp
 This man page was written by
-.An Ken Merry Aq ken@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org
 with additional input from
-.An Stephen McConnell Aq stephen.mcconnell@lsi.com .
+.An Stephen McConnell Aq Mt stephen.mcconnell@lsi.com .
diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4
index 6840c21..deeca95 100644
--- a/share/man/man4/mps.4
+++ b/share/man/man4/mps.4
@@ -210,10 +210,10 @@ driver first appeared in
 The
 .Nm
 driver was originally written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 It has been improved and tested by LSI Logic Corporation.
 This man page was written by
-.An Ken Merry Aq ken@FreeBSD.org .
+.An Ken Merry Aq Mt ken@FreeBSD.org .
 .Sh BUGS
 This driver has a couple of known shortcomings:
 .Bl -bullet -compact
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 9d62d17..d514cc9 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -178,9 +178,9 @@ by
 .An Greg Ansley
 and marginally improved upon
 by
-.An Matt Jacob Aq mjacob@FreeBSD.org .
+.An Matt Jacob Aq Mt mjacob@FreeBSD.org .
 .Pp
-.An Justin Gibbs Aq gibbs@FreeBSD.org
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org
 and
-.An Scott Long Aq scottl@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 have made more substantial improvements.
diff --git a/share/man/man4/mrsas.4 b/share/man/man4/mrsas.4
index f56ef31..70cafca 100644
--- a/share/man/man4/mrsas.4
+++ b/share/man/man4/mrsas.4
@@ -377,7 +377,7 @@ This is the 12Gb/s MegaRAID HBA card which has device id 0x005F.
 The
 .Nm
 driver and this manual page were written by
-.An Kashyap Desai Aq Kashyap.Desai@lsi.com .
+.An Kashyap Desai Aq Mt Kashyap.Desai@lsi.com .
 .Sh TODO
 The driver does not support big-endian architectures at this time.
 .Pp
diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4
index 200c6f7..6c2a030 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -243,8 +243,7 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org
 and it is based on
 .Xr sk 4
 and Marvell's
diff --git a/share/man/man4/mvs.4 b/share/man/man4/mvs.4
index be8c3ea..167992e 100644
--- a/share/man/man4/mvs.4
+++ b/share/man/man4/mvs.4
@@ -175,4 +175,4 @@ The
 driver first appeared in
 .Fx 8.1 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/mxge.4 b/share/man/man4/mxge.4
index cb5738c..3e54062 100644
--- a/share/man/man4/mxge.4
+++ b/share/man/man4/mxge.4
@@ -166,7 +166,7 @@ go to the Myricom support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq help@myri.com .
+.Aq Mt help@myri.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -182,4 +182,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org .
+.An Andrew Gallatin Aq Mt gallatin@FreeBSD.org .
diff --git a/share/man/man4/my.4 b/share/man/man4/my.4
index 28b67dd..b1ca804 100644
--- a/share/man/man4/my.4
+++ b/share/man/man4/my.4
@@ -83,7 +83,7 @@ The
 driver was written by Myson Technology Inc.
 .Pp
 This manual page was written by
-.An Hiten M. Pandya Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/nand.4 b/share/man/man4/nand.4
index d23e292..4371e38 100644
--- a/share/man/man4/nand.4
+++ b/share/man/man4/nand.4
@@ -131,7 +131,8 @@ The
 .Nm
 framework support first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The
 .Nm
 framework was designed and developed by
diff --git a/share/man/man4/nandsim.4 b/share/man/man4/nandsim.4
index ebb5452..bf8d624 100644
--- a/share/man/man4/nandsim.4
+++ b/share/man/man4/nandsim.4
@@ -83,7 +83,8 @@ The
 .Nm
 support first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The
 .Nm
 kernel driver was developed by
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 8ab7199..01cdc93 100644
--- a/share/man/man4/ncv.4
+++ b/share/man/man4/ncv.4
@@ -128,6 +128,6 @@ The
 driver was written by
 .An Naofumi Honda .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and
-.An Noriaki Mitsunaga Aq non@FreeBSD.org .
+.An Noriaki Mitsunaga Aq Mt non@FreeBSD.org .
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 874a843..5e1c294 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -150,4 +150,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 90fc77e..b1a55ad 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -1479,6 +1479,6 @@ It first made its debut in the main tree in
 .Fx 3.4 .
 .Sh AUTHORS
 .An -nosplit
-.An Julian Elischer Aq julian@FreeBSD.org ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org ,
 with contributions by
-.An Archie Cobbs Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
diff --git a/share/man/man4/nfe.4 b/share/man/man4/nfe.4
index 45dd380..2934211 100644
--- a/share/man/man4/nfe.4
+++ b/share/man/man4/nfe.4
@@ -189,15 +189,12 @@ and then in
 The
 .Nm
 driver was written by
-.An Jonathan Gray
-.Aq jsg@openbsd.org
+.An Jonathan Gray Aq Mt jsg@openbsd.org
 and
-.An Damien Bergamini
-.Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 The
 .Nm
 driver was ported to
 .Fx
 by
-.An Shigeaki Tagashira
-.Aq shigeaki@se.hiroshima-u.ac.jp .
+.An Shigeaki Tagashira Aq Mt shigeaki@se.hiroshima-u.ac.jp .
diff --git a/share/man/man4/nfsmb.4 b/share/man/man4/nfsmb.4
index d6f39ce..f302219 100644
--- a/share/man/man4/nfsmb.4
+++ b/share/man/man4/nfsmb.4
@@ -51,4 +51,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 30f7c48..f00cb63 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -90,4 +90,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index 324fa41..cf38b2e 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -169,4 +169,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_atm.4 b/share/man/man4/ng_atm.4
index c11b911..9c07334 100644
--- a/share/man/man4/ng_atm.4
+++ b/share/man/man4/ng_atm.4
@@ -403,4 +403,4 @@ panics if set.
 .Xr ng_ether 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4
index 50131a2..3c7cfa9 100644
--- a/share/man/man4/ng_atmllc.4
+++ b/share/man/man4/ng_atmllc.4
@@ -93,4 +93,4 @@ control message, or when all hooks have been disconnected.
 .%O RFC 1483
 .Re
 .Sh AUTHORS
-.An Benno Rice Aq benno@FreeBSD.org
+.An Benno Rice Aq Mt benno@FreeBSD.org
diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index c956dd0..b19dee1 100644
--- a/share/man/man4/ng_bluetooth.4
+++ b/share/man/man4/ng_bluetooth.4
@@ -109,4 +109,4 @@ The
 module was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index 44a51e3..0edb499 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -180,7 +180,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 When built as a loadable kernel module, this module includes the file
 .Pa net/bpf_filter.c .
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 6ec8708..9b3e600 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -209,4 +209,4 @@ The
 node type was implemented in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index b6c3ba7..9cff66b 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -122,8 +122,8 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 The driver is based on information obtained from
-.An Jose Orlando Pereira Aq jop@di.uminho.pt
+.An Jose Orlando Pereira Aq Mt jop@di.uminho.pt
 and disassembled the W2K driver.
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index 12f2844..103497a 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -348,7 +348,7 @@ The
 module was implemented in
 .Fx 5.0 .
 .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/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4
index 348b03d..ade4649 100644
--- a/share/man/man4/ng_car.4
+++ b/share/man/man4/ng_car.4
@@ -208,7 +208,7 @@ SEQ
 .%O RFC 2698
 .Re
 .Sh AUTHORS
-.An Nuno Antunes Aq nuno.antunes@gmail.com
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Nuno Antunes Aq Mt nuno.antunes@gmail.com
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 .Sh BUGS
 At this moment only DROP and FORWARD actions are implemented.
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index c3a0df4..3d6778f 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -320,4 +320,4 @@ Return extended status information from the node.
 .Xr ng_uni 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 143ecdb..3904176 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -175,8 +175,8 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org ,
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 Not all of the functionality has been implemented.
 For example,
diff --git a/share/man/man4/ng_deflate.4 b/share/man/man4/ng_deflate.4
index dbf3c56..92710b4 100644
--- a/share/man/man4/ng_deflate.4
+++ b/share/man/man4/ng_deflate.4
@@ -151,7 +151,7 @@ control message, or when hook have been disconnected.
 .%O RFC 1661
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@alkar.net
+.An Alexander Motin Aq Mt mav@alkar.net
 .Sh BUGS
 Due to nature of netgraph PPP implementation there are possible race conditions
 between data packet and ResetAck CCP packet in case of packet loss. As result,
diff --git a/share/man/man4/ng_device.4 b/share/man/man4/ng_device.4
index a03a03b..5374e64 100644
--- a/share/man/man4/ng_device.4
+++ b/share/man/man4/ng_device.4
@@ -92,5 +92,5 @@ The
 node type was first implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Mark Santcroos Aq marks@ripe.net
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Mark Santcroos Aq Mt marks@ripe.net
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index f502c62..ac05d54 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -70,4 +70,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index a35f4fa..5e78b3d 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -151,4 +151,4 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 610a8af..6d579e8 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -224,8 +224,8 @@ ngctl connect fxp0: lower upper left
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 The automatic KLD module loading mechanism that works for most
 other Netgraph node types does not work for the
diff --git a/share/man/man4/ng_ether_echo.4 b/share/man/man4/ng_ether_echo.4
index 2f9dd38..e86c3a9 100644
--- a/share/man/man4/ng_ether_echo.4
+++ b/share/man/man4/ng_ether_echo.4
@@ -74,4 +74,4 @@ The
 node type was implemented in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 576fdfe..7f7f025 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -87,7 +87,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 Technically, frames on DLCI X should not be transmitted to the switch
 until the LMI protocol entity on both ends has configured DLCI X as active.
diff --git a/share/man/man4/ng_gif.4 b/share/man/man4/ng_gif.4
index 2f360c0..dcda5e6 100644
--- a/share/man/man4/ng_gif.4
+++ b/share/man/man4/ng_gif.4
@@ -123,4 +123,4 @@ interface to standard output decoded in hex and ASCII:
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
diff --git a/share/man/man4/ng_gif_demux.4 b/share/man/man4/ng_gif_demux.4
index b245e09..e827659 100644
--- a/share/man/man4/ng_gif_demux.4
+++ b/share/man/man4/ng_gif_demux.4
@@ -104,4 +104,4 @@ This node type supports only the generic control messages.
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
diff --git a/share/man/man4/ng_h4.4 b/share/man/man4/ng_h4.4
index a3b99ed..bb539a2 100644
--- a/share/man/man4/ng_h4.4
+++ b/share/man/man4/ng_h4.4
@@ -115,7 +115,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 This node still uses
 .Xr spltty 9
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index 7ef7fcb..d5727ef 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -381,7 +381,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .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/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 4d0c077..227170d 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -88,4 +88,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_hub.4 b/share/man/man4/ng_hub.4
index da68723..bdd3f42 100644
--- a/share/man/man4/ng_hub.4
+++ b/share/man/man4/ng_hub.4
@@ -72,4 +72,4 @@ The
 node type appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index 270aa4f..66de96e 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -163,4 +163,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_ip_input.4 b/share/man/man4/ng_ip_input.4
index 430f43c..0c4cbaf 100644
--- a/share/man/man4/ng_ip_input.4
+++ b/share/man/man4/ng_ip_input.4
@@ -95,7 +95,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/ng_ipfw.4 b/share/man/man4/ng_ipfw.4
index 9a9099e..19e8f74 100644
--- a/share/man/man4/ng_ipfw.4
+++ b/share/man/man4/ng_ipfw.4
@@ -114,4 +114,4 @@ node type was implemented in
 The
 .Nm ipfw
 node was written by
-.An "Gleb Smirnoff" Aq glebius@FreeBSD.org .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index ff67028..0590bbf 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -239,4 +239,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index ba5df7d..63b2ede 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -416,7 +416,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .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/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index fc5ed07..11f3c5e 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -326,4 +326,4 @@ The
 node type was developed at Packet Design, LLC,
 .Pa http://www.packetdesign.com/ .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@packetdesign.com
+.An Archie Cobbs Aq Mt archie@packetdesign.com
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 5378717..21a96d1 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -135,4 +135,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index e7eeedf..0d4d674 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -185,7 +185,7 @@ option.
 .%O RFC 2637
 .Re
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 In PPP, encryption should be handled by the Encryption Control Protocol (ECP)
 rather than CCP.
diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4
index 9b3b3fc..e0d056d 100644
--- a/share/man/man4/ng_nat.4
+++ b/share/man/man4/ng_nat.4
@@ -347,4 +347,4 @@ The
 node type was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index 3c710dc..fb7e1fa 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -335,13 +335,13 @@ SEQ
 The
 .Nm
 node type was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org ,
-.An Alexander Motin Aq mav@FreeBSD.org ,
-.An Alexander Chernikov Aq melifaro@ipfw.ru .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org ,
+.An Alexander Motin Aq Mt mav@FreeBSD.org ,
+.An Alexander Chernikov Aq Mt melifaro@ipfw.ru .
 The initial code was based on
 .Nm ng_ipacct
 written by
-.An Roman V. Palagin Aq romanp@unshadow.net .
+.An Roman V. Palagin Aq Mt romanp@unshadow.net .
 .Sh BUGS
 Cache snapshot obtained via
 .Dv NGM_NETFLOW_SHOW
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 288ea18..845254e 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -268,11 +268,9 @@ node type was implemented in
 The
 .Nm one2many
 netgraph node (with round-robin algorithm) was written by
-.An Archie Cobbs
-.Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
 The all algorithm was added by
-.An Rogier R. Mulhuijzen
-.Aq drwilco@drwilco.net .
+.An Rogier R. Mulhuijzen Aq Mt drwilco@drwilco.net .
 .Sh BUGS
 More transmit and link failure algorithms should be supported.
 A good candidate is Cisco's Etherchannel.
diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4
index db7ede54..52658ac 100644
--- a/share/man/man4/ng_patch.4
+++ b/share/man/man4/ng_patch.4
@@ -218,9 +218,11 @@ The
 node type was implemented in
 .Fx 8.1 .
 .Sh AUTHORS
-.An "Maxim Ignatenko" Aq gelraen.ua@gmail.com .
+.An Maxim Ignatenko Aq Mt gelraen.ua@gmail.com
+.Pp
+.An -nosplit
 This manual page was written by
-.An "Vadim Goncharov" Aq vadimnuclight@tpu.ru .
+.An Vadim Goncharov Aq Mt vadimnuclight@tpu.ru .
 .Sh BUGS
 Node blindly tries to apply every patching operation to each packet
 (except those which offset if greater than length of the packet),
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 26c2853..89e662c 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -457,4 +457,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index a124d67..c2cf63f 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -504,4 +504,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 3e26f9c..fccecf8 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -169,7 +169,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 The node should not expect incoming GRE packets to have an IP header.
 This behavior is inherited from the (converse) behavior of raw IP sockets.
diff --git a/share/man/man4/ng_pred1.4 b/share/man/man4/ng_pred1.4
index fed3fdc..7befbbc 100644
--- a/share/man/man4/ng_pred1.4
+++ b/share/man/man4/ng_pred1.4
@@ -138,7 +138,7 @@ control message, or when hook have been disconnected.
 .%O RFC 1661
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@alkar.net
+.An Alexander Motin Aq Mt mav@alkar.net
 .Sh BUGS
 Due to nature of netgraph PPP implementation there are possible race conditions
 between data packet and ResetAck CCP packet in case of packet loss. As result,
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index de45fb7..51baa9e 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -136,6 +136,6 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 Not all of RFC 1490 is implemented.
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 84ddd15..d05802b 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -179,7 +179,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 It is not possible to reject the connection of a hook, though any
 data received on that hook can certainly be ignored.
diff --git a/share/man/man4/ng_split.4 b/share/man/man4/ng_split.4
index 4062ca2..827ecb6 100644
--- a/share/man/man4/ng_split.4
+++ b/share/man/man4/ng_split.4
@@ -84,5 +84,5 @@ but incorporated into
 in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
-.An Vitaly V. Belekhov Aq vitaly@riss-telecom.ru
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Vitaly V. Belekhov Aq Mt vitaly@riss-telecom.ru
diff --git a/share/man/man4/ng_sppp.4 b/share/man/man4/ng_sppp.4
index d23268f..685d45f 100644
--- a/share/man/man4/ng_sppp.4
+++ b/share/man/man4/ng_sppp.4
@@ -169,4 +169,4 @@ It was included to the system since
 .Fx 5.3 .
 .Sh AUTHORS
 Copyright (C) 2003-2004
-.An Roman Kurakin Aq rik@cronyx.ru .
+.An Roman Kurakin Aq Mt rik@cronyx.ru
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
index c44c1f4..2c444da 100644
--- a/share/man/man4/ng_sscfu.4
+++ b/share/man/man4/ng_sscfu.4
@@ -158,4 +158,4 @@ If the node has not been enabled, 0 is returned.
 .Xr ng_sscop 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4
index 5496a37..c98a434 100644
--- a/share/man/man4/ng_sscop.4
+++ b/share/man/man4/ng_sscop.4
@@ -400,4 +400,4 @@ were disabled.
 .Xr ng_sscfu 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_tag.4 b/share/man/man4/ng_tag.4
index 70bd234..6aac9fa 100644
--- a/share/man/man4/ng_tag.4
+++ b/share/man/man4/ng_tag.4
@@ -329,7 +329,7 @@ The
 node type was implemented in
 .Fx 6.2 .
 .Sh AUTHORS
-.An Vadim Goncharov Aq vadimnuclight@tpu.ru
+.An Vadim Goncharov Aq Mt vadimnuclight@tpu.ru
 .Sh BUGS
 For manipulating any tags with data payload (that is, all tags with non-zero
 .Va tag_len )
diff --git a/share/man/man4/ng_tcpmss.4 b/share/man/man4/ng_tcpmss.4
index 240d975..e13c562 100644
--- a/share/man/man4/ng_tcpmss.4
+++ b/share/man/man4/ng_tcpmss.4
@@ -119,7 +119,7 @@ The
 node type was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Alexey Popov Aq lollypop@flexuser.ru
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Alexey Popov Aq Mt lollypop@flexuser.ru
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
 .Sh BUGS
 When running on SMP, system statistics may be broken.
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index e86209d..426aaf9 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -131,4 +131,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 3add57c..c8d5b37 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -116,8 +116,8 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
-.An Andrew Thompson Aq thompsa@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org
 .Sh BUGS
 The serial driver code also has a notion of a
 .Dq hot character .
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index ef8a57e..0036fa8 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -118,7 +118,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Isochronous USB transfers are broken.
 This means that the USB device will not be able to transfer SCO data (voice).
diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4
index a2e3c45..da7028b 100644
--- a/share/man/man4/ng_uni.4
+++ b/share/man/man4/ng_uni.4
@@ -404,7 +404,7 @@ The
 .Nm uni
 netgraph node
 and this manual page were written by
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh BUGS
 .Bl -bullet -compact
 .It
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index 83f0269..bc4d562 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -217,7 +217,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 As the initialization routine in the kernel implementation of
 Van Jacobson compression initializes both compression and decompression
diff --git a/share/man/man4/ng_vlan.4 b/share/man/man4/ng_vlan.4
index 1efaccc..7b225fd 100644
--- a/share/man/man4/ng_vlan.4
+++ b/share/man/man4/ng_vlan.4
@@ -142,4 +142,4 @@ The
 node type appeared in
 .Fx 4.10 .
 .Sh AUTHORS
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4
index fd885ee..0227b44 100644
--- a/share/man/man4/ngatmbase.4
+++ b/share/man/man4/ngatmbase.4
@@ -131,4 +131,4 @@ returns an appropriate error code.
 .Xr ng_sscop 4 ,
 .Xr ng_uni 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index ec02052..227cffb 100644
--- a/share/man/man4/nge.4
+++ b/share/man/man4/nge.4
@@ -224,4 +224,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@bsdi.com .
+.An Bill Paul Aq Mt wpaul@bsdi.com .
diff --git a/share/man/man4/nsp.4 b/share/man/man4/nsp.4
index 7ff7fe1..86e3330 100644
--- a/share/man/man4/nsp.4
+++ b/share/man/man4/nsp.4
@@ -91,8 +91,8 @@ driver was written by
 .An Naofumi HONDA .
 .Pp
 This manual page was written by
-.An Noriaki MITSUNAGA Aq non@FreeBSD.org
+.An Noriaki MITSUNAGA Aq Mt non@FreeBSD.org
 and
-.An Hideyuki KURASHINA Aq rushani@FreeBSD.org .
+.An Hideyuki KURASHINA Aq Mt rushani@FreeBSD.org .
 .Sh BUGS
 SMIT mode is only supported under OLDCARD now.
diff --git a/share/man/man4/ntb.4 b/share/man/man4/ntb.4
index ac16c61..ada350a 100644
--- a/share/man/man4/ntb.4
+++ b/share/man/man4/ntb.4
@@ -94,7 +94,7 @@ variable.
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Carl Delsey Aq carl@FreeBSD.org.
+.An Carl Delsey Aq Mt carl@FreeBSD.org .
 .Sh BUGS
 If the driver is unloaded, it cannot be reloaded without a system reboot.
 .Pp
diff --git a/share/man/man4/nvd.4 b/share/man/man4/nvd.4
index 0874ad5..f5210bf 100644
--- a/share/man/man4/nvd.4
+++ b/share/man/man4/nvd.4
@@ -90,8 +90,8 @@ driver first appeared in
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org ,
+.An Jim Harris Aq Mt jimharris@FreeBSD.org ,
 with contributions from Joe Golio at EMC.
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/nvme.4 b/share/man/man4/nvme.4
index 0ea529b..068b006 100644
--- a/share/man/man4/nvme.4
+++ b/share/man/man4/nvme.4
@@ -164,8 +164,10 @@ driver first appeared in
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org ,
-with contributions from Joe Golio at EMC.
+.An Jim Harris Aq Mt jimharris@FreeBSD.org ,
+with contributions from
+.An Joe Golio
+at EMC.
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/nvram2env.4 b/share/man/man4/nvram2env.4
index 36423fb..b9b0311 100644
--- a/share/man/man4/nvram2env.4
+++ b/share/man/man4/nvram2env.4
@@ -113,6 +113,4 @@ hint.nvram.1.base=0x1cff8000
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An -nosplit
-.Nm
-.An Aleksandr Rybalko Aq ray@ddteam.net .
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net
diff --git a/share/man/man4/nxge.4 b/share/man/man4/nxge.4
index 8d94afc..7d18c78 100644
--- a/share/man/man4/nxge.4
+++ b/share/man/man4/nxge.4
@@ -79,7 +79,7 @@ For troubleshooting tips and FAQs, please visit
 .Pa http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous .
 .Pp
 For any issues please send an email to
-.Aq support@neterion.com .
+.Aq Mt support@neterion.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -93,5 +93,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Neterion
-.Aq support@neterion.com .
+.An Neterion Aq Mt support@neterion.com .
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 4a60c8b..b89eeb7 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -72,7 +72,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@carlstedt.se
+.An Lennart Augustsson Aq Mt augustss@carlstedt.se
 for the
 .Nx
 project.
diff --git a/share/man/man4/orm.4 b/share/man/man4/orm.4
index 2922cb6..ede8c75 100644
--- a/share/man/man4/orm.4
+++ b/share/man/man4/orm.4
@@ -41,7 +41,7 @@ top of an option ROM.
 .Sh AUTHORS
 This
 manual page was written by
-.An Nikolai Saoukh Aq nms@otdel-1.org .
+.An Nikolai Saoukh Aq Mt nms@otdel-1.org .
 .Sh BUGS
 Due to the implementation of the resource manager,
 other drivers cannot attach to the option ROM address range.
diff --git a/share/man/man4/padlock.4 b/share/man/man4/padlock.4
index 2a74f63..ad648af 100644
--- a/share/man/man4/padlock.4
+++ b/share/man/man4/padlock.4
@@ -87,11 +87,11 @@ release to include it was
 The
 .Nm
 driver with AES encryption support was written by
-.An Jason Wright Aq jason@OpenBSD.org .
+.An Jason Wright Aq Mt jason@OpenBSD.org .
 It was ported to
 .Fx
 and then extended to support SHA1 and SHA256
 by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
 This manual page was written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org .
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org .
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index 7819ea3..7280de1 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -112,7 +112,7 @@ None.
 The CAM passthrough driver 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
 It might be nice to have a way to asynchronously send CCBs through the
 passthrough driver.
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 443b9f7..4f7a104 100644
--- a/share/man/man4/patm.4
+++ b/share/man/man4/patm.4
@@ -159,7 +159,7 @@ Thanks to Christian Bucari from ProSum for lending two of these cards to enable
 the development of this driver.
 Thanks also for answering my questions.
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 The card fails to generate an interrupt if a cell is received in AAL0 mode
 that has the MSB of the PTI field cleared.
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index c79626f..b1a056b 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -331,7 +331,7 @@ Support for device listing and matching was re-implemented by
 Kenneth Merry, and 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
 It is not possible for users to specify an accurate offset into the device
 list without calling the
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index c92b1e6..78ab5b2 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -780,14 +780,14 @@ The API evolved from the VOXWARE
 standard which later became OSS standard.
 .Sh AUTHORS
 .An -nosplit
-.An Luigi Rizzo Aq luigi@iet.unipi.it
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it
 initially wrote the
 .Nm pcm
 device driver and this manual page.
-.An Cameron Grant Aq gandalf@vilnya.demon.co.uk
+.An Cameron Grant Aq Mt gandalf@vilnya.demon.co.uk
 later revised the device driver for
 .Fx 4.0 .
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
 revised this manual page.
 It was then rewritten for
 .Fx 5.2 .
diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4
index b86e4fb..619f207 100644
--- a/share/man/man4/pcn.4
+++ b/share/man/man4/pcn.4
@@ -188,4 +188,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@osd.bsdi.com .
+.An Bill Paul Aq Mt wpaul@osd.bsdi.com .
diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4
index 6abc37c..2d9018c 100644
--- a/share/man/man4/polling.4
+++ b/share/man/man4/polling.4
@@ -219,4 +219,4 @@ and
 .Fx 5.0 .
 .Sh AUTHORS
 Device polling was written by
-.An Luigi Rizzo Aq luigi@iet.unipi.it .
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it .
diff --git a/share/man/man4/procdesc.4 b/share/man/man4/procdesc.4
index e6895b0..ec8c827 100644
--- a/share/man/man4/procdesc.4
+++ b/share/man/man4/procdesc.4
@@ -77,13 +77,13 @@ and was developed at the University of Cambridge.
 .Nm
 was developed by
 .An -nosplit
-.An "Robert Watson" Aq rwatson@FreeBSD.org
+.An Robert Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge, and
-.An "Ben Laurie" Aq benl@FreeBSD.org
+.An Ben Laurie Aq Mt benl@FreeBSD.org
 and
-.An "Kris Kennaway" Aq kris@FreeBSD.org
+.An Kris Kennaway Aq Mt kris@FreeBSD.org
 at Google, Inc.
 .Sh BUGS
 .Nm
diff --git a/share/man/man4/proto.4 b/share/man/man4/proto.4
index 74aa49a..ead546b 100644
--- a/share/man/man4/proto.4
+++ b/share/man/man4/proto.4
@@ -112,7 +112,7 @@ single memory mapped I/O region will have the following device special files:
 The
 .Nm
 device driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
 .Sh SECURITY CONSIDERATIONS
 Because programs have direct access to the hardware, the
 .Nm
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 6ecb65c..866e447 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -833,7 +833,7 @@ and
 to name the few.
 .Pp
 This manual page was written 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 `taps' the surface of the pad.
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index 3ce95d8..5497577 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -72,5 +72,4 @@ driver first appeared in
 The
 .Nm
 driver and man page was written by
-.An S\(/oren Schmidt
-.Aq sos@FreeBSD.org .
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org .
diff --git a/share/man/man4/qlxgb.4 b/share/man/man4/qlxgb.4
index c76386f..c1e87e3 100644
--- a/share/man/man4/qlxgb.4
+++ b/share/man/man4/qlxgb.4
@@ -72,7 +72,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/qlxgbe.4 b/share/man/man4/qlxgbe.4
index 888a575..32b7d34 100644
--- a/share/man/man4/qlxgbe.4
+++ b/share/man/man4/qlxgbe.4
@@ -70,7 +70,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/qlxge.4 b/share/man/man4/qlxge.4
index 01d2c05..21e6ce1 100644
--- a/share/man/man4/qlxge.4
+++ b/share/man/man4/qlxge.4
@@ -70,7 +70,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index f2a2bd1..c99902a 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -271,7 +271,7 @@ Support for the RT3090 chipset was added in
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/rc.4 b/share/man/man4/rc.4
index 60c4fa5..c2ab34a 100644
--- a/share/man/man4/rc.4
+++ b/share/man/man4/rc.4
@@ -109,7 +109,7 @@ This 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
 .Nm
diff --git a/share/man/man4/re.4 b/share/man/man4/re.4
index bd720f4..e5fc7b0 100644
--- a/share/man/man4/re.4
+++ b/share/man/man4/re.4
@@ -253,7 +253,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
 .Sh BUGS
 The Xterasys XN-152 32-bit PCI NIC, which uses the RTL8169 MAC and
 Marvell 88E1000 PHY, has a defect that causes DMA corruption
diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4
index 5819677..476b15b 100644
--- a/share/man/man4/rights.4
+++ b/share/man/man4/rights.4
@@ -667,8 +667,8 @@ Project.
 .Sh AUTHORS
 .An -nosplit
 This manual page was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation based on the
 .Xr cap_new 2
 manual page by
-.An "Robert Watson" Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 583274b..0de968f 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -273,7 +273,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 Since outbound packets must be longword aligned, the transmit
 routine has to copy an unaligned packet into an mbuf cluster buffer
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index a894f12..d8a130c 100644
--- a/share/man/man4/rp.4
+++ b/share/man/man4/rp.4
@@ -169,15 +169,15 @@ Off  Off  Off  Off   380-3C3
 .It Pa /dev/ttyR[0-4][0-9a-f]
 .El
 .Sh AUTHORS
-.An Theodore Ts'o Aq tytso@mit.edu
+.An Theodore Ts'o Aq Mt tytso@mit.edu
 .Pp
 This driver was written under contract for Comtrol Corporation.
 For dealer, distributor and other information regarding Comtrol
 .Tn RocketPort ,
 contact Comtrol Corporation at (800) 926-6876 or send email to
-.Aq info@comtrol.com .
+.Aq Mt info@comtrol.com .
 To report bugs for this driver, please send email to
-.Aq bug-bsdi-rocketport@comtrol.com .
+.Aq Mt bug-bsdi-rocketport@comtrol.com .
 .Sh BUGS
 If incoming software flow control is enabled on a 486 or Pentium
 machine, and the flow control is very heavily exercised, on rare occasions
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index e26e358..be4aad9 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -171,9 +171,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org
+.An Damien Bergamini Aq Mt damien@openbsd.org
 and ported by
-.An Rui Paulo Aq rpaulo@freebsd.org .
+.An Rui Paulo Aq Mt rpaulo@freebsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index 06f91e8..7450ccf 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -151,4 +151,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Shunsuke Akiyama Aq akiyama@FreeBSD.org .
+.An Shunsuke Akiyama Aq Mt akiyama@FreeBSD.org .
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 6e45689..3abcbca 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -175,12 +175,13 @@ The
 driver first appeared in
 .Ox 4.0 .
 .Sh AUTHORS
+.An -nosplit
 The original
 .Nm
 driver was written by
-.An Niall O'Higgins Aq niallo@openbsd.org
+.An Niall O'Higgins Aq Mt niallo@openbsd.org
 and
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh BUGS
 Host AP mode doesn't support client power save.
 Clients using power save mode will experience
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index f86a296..52ce544 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -244,7 +244,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/scc.4 b/share/man/man4/scc.4
index b08b3f8..80072f5 100644
--- a/share/man/man4/scc.4
+++ b/share/man/man4/scc.4
@@ -72,4 +72,4 @@ device driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man4/sched_ule.4 b/share/man/man4/sched_ule.4
index 42dee4d..7ba18d3 100644
--- a/share/man/man4/sched_ule.4
+++ b/share/man/man4/sched_ule.4
@@ -72,5 +72,4 @@ The
 scheduler first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
-.An Jeff Roberson
-.Aq jeff@FreeBSD.org
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 0b6ac2d..2e08d28 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -238,4 +238,4 @@ SGR	E[nm	Set character attributes:		--
 note: the first E in the sequences stands for ESC (0x1b)
 .Ed
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 8684307..7c786ea 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -351,4 +351,4 @@ The
 .Nm
 .Tn ATA
 support was added by
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org .
diff --git a/share/man/man4/sdhci.4 b/share/man/man4/sdhci.4
index 6adfd81..8fd16ff 100644
--- a/share/man/man4/sdhci.4
+++ b/share/man/man4/sdhci.4
@@ -80,7 +80,7 @@ TI PCIXX21/XX11
 .%T "SD Specifications, Part 2, SD Host Controller, Simplified Specification"
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 .Sh BUGS
 Many of existing SD controller chips have some nonstandard requirements,
 proprietary registers and hardware bugs, requiring additional handling.
diff --git a/share/man/man4/send.4 b/share/man/man4/send.4
index 3f90eaf..4af510a 100644
--- a/share/man/man4/send.4
+++ b/share/man/man4/send.4
@@ -206,7 +206,7 @@ The
 module first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Ana Kukec Aq anchie@FreeBSD.org ,
+.An Ana Kukec Aq Mt anchie@FreeBSD.org ,
 University of Zagreb
 .Sh BUGS
 Due to the lack of NDP locking, it is currently not possible to unload the
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 80ba44e..a32df91 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -206,4 +206,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/sge.4 b/share/man/man4/sge.4
index 70d839e..0322169 100644
--- a/share/man/man4/sge.4
+++ b/share/man/man4/sge.4
@@ -112,10 +112,8 @@ SiS191 Fast/Gigabit Ethernet controller
 The
 .Nm
 driver was written by
-.An Alexander Pohoyda
-.Aq alexander.pohoyda@gmx.net .
+.An Alexander Pohoyda Aq Mt alexander.pohoyda@gmx.net .
 And enhanced by
-.An Nikolay Denev
-.Aq ndenev@gmail.com .
+.An Nikolay Denev Aq Mt ndenev@gmail.com .
 It first appeared in
 .Fx 8.1 .
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 5eb7629..1f00885 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -144,22 +144,22 @@ locked termios state devices for dialout ports
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
-.An Andy Rutter Aq andy@specialix.co.uk .
+.An Andy Rutter Aq Mt andy@specialix.co.uk .
 The System V driver source is/was available by ftp from
 .Sy ftp.specialix.co.uk .
 .Pp
 This driver is not supported by Specialix International.
 .Sh AUTHORS
 .An -nosplit
-.An Peter Wemm Aq peter@netplex.com.au
+.An Peter Wemm Aq Mt peter@netplex.com.au
 obtained the code from
 .An Andy Rutter
 and ported it to
 .Fx
 and threw the man page together.
-.An Bruce Evans Aq bde@zeta.org.au
+.An Bruce Evans Aq Mt bde@zeta.org.au
 provided a large amount of assistance during porting.
-.An Nick Sayer Aq nick@specialix.com
+.An Nick Sayer Aq Mt nick@specialix.com
 wrote the EISA, PCI and SX portions.
 .Sh BUGS
 The interrupt tuning rate is not believed to be optimal at this time for
diff --git a/share/man/man4/siba.4 b/share/man/man4/siba.4
index 288a13f..6f855d4 100644
--- a/share/man/man4/siba.4
+++ b/share/man/man4/siba.4
@@ -81,10 +81,8 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bruce M. Simpson
-.Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 and
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
 .Sh CAVEATS
 Host mode is not supported at this moment.
diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4
index ab92f77..4f29c11 100644
--- a/share/man/man4/siftr.4
+++ b/share/man/man4/siftr.4
@@ -642,12 +642,12 @@ http://caia.swin.edu.au/freebsd/etcp09/
 .An -nosplit
 .Nm
 was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An James Healy Aq jimmy@deefa.com .
+.An James Healy Aq Mt jimmy@deefa.com .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Sh BUGS
 Current known limitations and any relevant workarounds are outlined below:
 .Bl -dash
diff --git a/share/man/man4/siis.4 b/share/man/man4/siis.4
index 366c3cc..4bf97c2 100644
--- a/share/man/man4/siis.4
+++ b/share/man/man4/siis.4
@@ -138,4 +138,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index 414f0d8..66eadc5 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -223,4 +223,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index 18e53a9..d78eafe 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -238,4 +238,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 1dfd283..890898f 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -160,4 +160,4 @@ in
 .Fx 5.0
 also introduced support for SMP on the ia64 and sparc64 architectures.
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.org
+.An Steve Passe Aq Mt fsmp@FreeBSD.org
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index 3d2cb0c..2bc5a46 100644
--- a/share/man/man4/snd_ad1816.4
+++ b/share/man/man4/snd_ad1816.4
@@ -76,6 +76,6 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Luigi Rizzo" Aq luigi@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Luigi Rizzo Aq Mt luigi@FreeBSD.org
 .An "Hannu Savolainen"
diff --git a/share/man/man4/snd_als4000.4 b/share/man/man4/snd_als4000.4
index a13779a..fbf63f4 100644
--- a/share/man/man4/snd_als4000.4
+++ b/share/man/man4/snd_als4000.4
@@ -67,4 +67,4 @@ The
 device driver first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq oho@acm.org
+.An Orion Hodson Aq Mt oho@acm.org
diff --git a/share/man/man4/snd_atiixp.4 b/share/man/man4/snd_atiixp.4
index ba02da6..45c65f9 100644
--- a/share/man/man4/snd_atiixp.4
+++ b/share/man/man4/snd_atiixp.4
@@ -89,7 +89,7 @@ device driver first appeared in
 .Fx 6.1 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/snd_cmi.4 b/share/man/man4/snd_cmi.4
index d6dc088..35aded6 100644
--- a/share/man/man4/snd_cmi.4
+++ b/share/man/man4/snd_cmi.4
@@ -73,4 +73,4 @@ The
 device driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq O.Hodson@cs.ucl.ac.uk
+.An Orion Hodson Aq Mt O.Hodson@cs.ucl.ac.uk
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index 2b94174..ee7b4dd 100644
--- a/share/man/man4/snd_cs4281.4
+++ b/share/man/man4/snd_cs4281.4
@@ -67,4 +67,4 @@ The
 device driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq O.Hodson@cs.ucl.ac.uk
+.An Orion Hodson Aq Mt O.Hodson@cs.ucl.ac.uk
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index 36a6857..ed0fb76 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -95,4 +95,4 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index d691924..2d34913 100644
--- a/share/man/man4/snd_ds1.4
+++ b/share/man/man4/snd_ds1.4
@@ -69,4 +69,4 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index 3052f12..1d4a860 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -75,8 +75,8 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "David O'Brien" Aq obrien@FreeBSD.org
-.An "Orlando Bassotto" Aq orlando.bassotto@ieo-research.it
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An David O'Brien Aq Mt obrien@FreeBSD.org
+.An Orlando Bassotto Aq Mt orlando.bassotto@ieo-research.it
+.An Cameron Grant Aq Mt cg@FreeBSD.org
 .Sh BUGS
 Fancy features like DD5.1 output are not supported.
diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4
index 72568c3..6907274 100644
--- a/share/man/man4/snd_emu10kx.4
+++ b/share/man/man4/snd_emu10kx.4
@@ -275,11 +275,11 @@ device driver first appeared in
 The PCM part of the driver is based on the
 .Xr snd_emu10k1 4
 SB Live!\& driver by
-.An Cameron Grant Aq cg@FreeBSD.org .
+.An Cameron Grant Aq Mt cg@FreeBSD.org .
 The MIDI interface is based on the
 .Xr snd_emu10k1 4
 MIDI interface code by
-.An Mathew Kanner Aq matk@FreeBSD.org .
+.An Mathew Kanner Aq Mt matk@FreeBSD.org .
 The
 .Nm
 device driver and this manual page were written by
diff --git a/share/man/man4/snd_envy24.4 b/share/man/man4/snd_envy24.4
index 158fbf8..5844d92 100644
--- a/share/man/man4/snd_envy24.4
+++ b/share/man/man4/snd_envy24.4
@@ -81,4 +81,4 @@ The
 driver was written by
 .An Katsurajima Naoto .
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_envy24ht.4 b/share/man/man4/snd_envy24ht.4
index 03a9cb4..086d5cd 100644
--- a/share/man/man4/snd_envy24ht.4
+++ b/share/man/man4/snd_envy24ht.4
@@ -104,4 +104,4 @@ based upon the
 .Xr snd_envy24 4
 driver.
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index 9602fce..d00ea5f 100644
--- a/share/man/man4/snd_es137x.4
+++ b/share/man/man4/snd_es137x.4
@@ -111,7 +111,7 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An "Russell Cattelan" Aq cattelan@thebarn.com
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Joachim Kuebart"
-.An "Jonathan Noack" Aq noackjr@alumni.rice.edu
+.An Russell Cattelan Aq Mt cattelan@thebarn.com
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Joachim Kuebart
+.An Jonathan Noack Aq Mt noackjr@alumni.rice.edu
diff --git a/share/man/man4/snd_ess.4 b/share/man/man4/snd_ess.4
index bd0d6d7..2b03331 100644
--- a/share/man/man4/snd_ess.4
+++ b/share/man/man4/snd_ess.4
@@ -68,5 +68,5 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Luigi Rizzo" Aq luigi@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Luigi Rizzo Aq Mt luigi@FreeBSD.org
diff --git a/share/man/man4/snd_fm801.4 b/share/man/man4/snd_fm801.4
index 0e66504..48807ec 100644
--- a/share/man/man4/snd_fm801.4
+++ b/share/man/man4/snd_fm801.4
@@ -69,7 +69,7 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The Forte Media FM801 chipset is a sort of PCI bridge, not an actual
 sound controller, making it possible to have soundless support.
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 99df540..1ad73cf 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -91,7 +91,7 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Ville-Pertti Keinonen Aq will@iki.fi
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Ville-Pertti Keinonen Aq Mt will@iki.fi
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
 .Sh BUGS
 Recording pcm sound data is not supported yet.
diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4
index 91e599d..cdb2a62 100644
--- a/share/man/man4/snd_hda.4
+++ b/share/man/man4/snd_hda.4
@@ -605,15 +605,15 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Stephane E. Potvin Aq sepotvin@videotron.ca ,
-.An Ariff Abdullah Aq ariff@FreeBSD.org
+.An Stephane E. Potvin Aq Mt sepotvin@videotron.ca ,
+.An Ariff Abdullah Aq Mt ariff@FreeBSD.org
 and
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org .
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org ,
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Joel Dahl Aq Mt joel@FreeBSD.org ,
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 and
-.An Giorgos Keramidas Aq keramida@FreeBSD.org .
+.An Giorgos Keramidas Aq Mt keramida@FreeBSD.org .
 .Sh BUGS
 Some Hardware/OEM vendors tend to screw up BIOS settings or use custom
 unusual CODEC wiring that create problems to the driver.
diff --git a/share/man/man4/snd_ich.4 b/share/man/man4/snd_ich.4
index c4359c8..528d28c 100644
--- a/share/man/man4/snd_ich.4
+++ b/share/man/man4/snd_ich.4
@@ -108,4 +108,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Jorge Mario G. Mazo Aq jgutie11@eafit.edu.co .
+.An Jorge Mario G. Mazo Aq Mt jgutie11@eafit.edu.co .
diff --git a/share/man/man4/snd_maestro.4 b/share/man/man4/snd_maestro.4
index d630a33..eb74709 100644
--- a/share/man/man4/snd_maestro.4
+++ b/share/man/man4/snd_maestro.4
@@ -75,4 +75,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Jorge Mario G. Mazo Aq jgutie11@eafit.edu.co .
+.An Jorge Mario G. Mazo Aq Mt jgutie11@eafit.edu.co .
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 4fadd04..fa61a5b 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -90,5 +90,5 @@ The
 driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An Scott Long Aq scottl@FreeBSD.org
-.An Darrel Anderson Aq anderson@cs.duke.edu
+.An Scott Long Aq Mt scottl@FreeBSD.org
+.An Darrel Anderson Aq Mt anderson@cs.duke.edu
diff --git a/share/man/man4/snd_mss.4 b/share/man/man4/snd_mss.4
index 76ef183..1baf198 100644
--- a/share/man/man4/snd_mss.4
+++ b/share/man/man4/snd_mss.4
@@ -113,4 +113,4 @@ device driver first appeared in
 .Fx 2.2.6 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_neomagic.4 b/share/man/man4/snd_neomagic.4
index 430220c..2865bbb 100644
--- a/share/man/man4/snd_neomagic.4
+++ b/share/man/man4/snd_neomagic.4
@@ -71,4 +71,4 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 8b53c8e..227080c 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -129,4 +129,4 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index 55e12fc..c694cc5 100644
--- a/share/man/man4/snd_solo.4
+++ b/share/man/man4/snd_solo.4
@@ -63,4 +63,4 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
diff --git a/share/man/man4/snd_spicds.4 b/share/man/man4/snd_spicds.4
index 7b95b86..aea0c56 100644
--- a/share/man/man4/snd_spicds.4
+++ b/share/man/man4/snd_spicds.4
@@ -86,4 +86,4 @@ based upon the
 .Xr snd_envy24 4
 driver.
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_t4dwave.4 b/share/man/man4/snd_t4dwave.4
index ef91665..c96eefb 100644
--- a/share/man/man4/snd_t4dwave.4
+++ b/share/man/man4/snd_t4dwave.4
@@ -74,4 +74,4 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index b045851..d104947 100644
--- a/share/man/man4/snd_uaudio.4
+++ b/share/man/man4/snd_uaudio.4
@@ -86,7 +86,7 @@ This manual page was adopted from
 and modified for
 .Fx
 by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Tn PCM
diff --git a/share/man/man4/snd_via8233.4 b/share/man/man4/snd_via8233.4
index 377fbd3..5637701 100644
--- a/share/man/man4/snd_via8233.4
+++ b/share/man/man4/snd_via8233.4
@@ -95,7 +95,7 @@ device driver first appeared in
 .Fx 4.7 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/snd_via82c686.4 b/share/man/man4/snd_via82c686.4
index 183684e..85c6c18 100644
--- a/share/man/man4/snd_via82c686.4
+++ b/share/man/man4/snd_via82c686.4
@@ -68,4 +68,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_vibes.4 b/share/man/man4/snd_vibes.4
index 716a65c..9db6f0f 100644
--- a/share/man/man4/snd_vibes.4
+++ b/share/man/man4/snd_vibes.4
@@ -68,4 +68,4 @@ device driver first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 2545164..48e10a9 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -83,12 +83,13 @@ the
 .Nm
 driver was rewritten to work with the replaced TTY subsystem.
 .Sh AUTHORS
+.An -nosplit
 The author of the current implementation is
-.An Ed Schouten Aq ed@FreeBSD.org .
+.An Ed Schouten Aq Mt ed@FreeBSD.org .
 Previous versions of
 .Nm
 were based on code written by
-.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il .
+.An Ugen J.S. Antsilevich Aq Mt ugen@NetVision.net.il .
 .Sh BUGS
 This version of
 .Nm
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
index a398007..5bbf53b 100644
--- a/share/man/man4/spic.4
+++ b/share/man/man4/spic.4
@@ -57,5 +57,5 @@ The
 device driver first appeared in
 .Fx 4.6 .
 .Sh AUTHORS
-.An Nick Sayer Aq nsayer@FreeBSD.org
-.An Will Andrews Aq will@FreeBSD.org
+.An Nick Sayer Aq Mt nsayer@FreeBSD.org
+.An Will Andrews Aq Mt will@FreeBSD.org
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index 1f39a1ee..c1f0894 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -222,10 +222,10 @@ The
 device appeared in
 .Fx 1.0 .
 .Sh AUTHORS
-.An Eric S. Raymond Aq esr@snark.thyrsus.com
+.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com ,
 June 1990
-.Sh "PORTED BY"
-.An Andrew A. Chernov Aq ache@astral.msk.su
+.Sh PORTED BY
+.An Andrew A. Chernov Aq Mt ache@astral.msk.su
 .Sh BUGS
 Due to roundoff in the pitch tables and slop in the tone-generation and timer
 hardware (neither of which was designed for precision), neither pitch accuracy
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 2a9a297..6cbccf3 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -259,24 +259,24 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 The
 .Pa splash_bmp
 module was written by
-.An Michael Smith Aq msmith@FreeBSD.org
+.An Michael Smith Aq Mt msmith@FreeBSD.org
 and
 .An Kazutaka Yokota .
 The
 .Pa splash_pcx
 module was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 based on the
 .Pa splash_bmp
 code.
 The
 .Pa splash_txt
 module was written by
-.An Antony Mawer Aq antony@mawer.org
+.An Antony Mawer Aq Mt antony@mawer.org
 based on the
 .Pa splash_bmp
 code, with some additional inspiration from the
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 519120f..00700d8 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -204,9 +204,8 @@ take place.
 The original implementation of
 .Nm
 was written in 1994 at Cronyx Ltd., Moscow by
-.An Serge Vakulenko Aq vak@cronyx.ru .
-.An J\(:org Wunsch
-.Aq joerg_wunsch@uriah.heep.sax.de
+.An Serge Vakulenko Aq Mt vak@cronyx.ru .
+.An J\(:org Wunsch Aq Mt joerg_wunsch@uriah.heep.sax.de
 rewrote a large part in 1997 in order
 to fully implement the state machine as described in RFC 1661, so it
 could also be used for dialup lines.
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 22982b1..60f7e43 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -201,4 +201,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/stge.4 b/share/man/man4/stge.4
index bfcaab0..527d241 100644
--- a/share/man/man4/stge.4
+++ b/share/man/man4/stge.4
@@ -192,11 +192,9 @@ and first appeared in
 The
 .Nx
 version was written by
-.An Jason R. Thorpe
-.Aq thorpej@NetBSD.org .
+.An Jason R. Thorpe Aq Mt thorpej@NetBSD.org .
 .Sh AUTHORS
 The
 .Nm
 driver was ported by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
diff --git a/share/man/man4/syncache.4 b/share/man/man4/syncache.4
index 45dcf2c..b212b12 100644
--- a/share/man/man4/syncache.4
+++ b/share/man/man4/syncache.4
@@ -212,4 +212,4 @@ then further extended here.
 The
 .Nm
 code and manual page were written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org .
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org .
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index d9400c9..cac0f82 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -550,9 +550,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org .
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org .
 This manual page was written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 .Sh CAVEATS
 The amount of data that is possible to insert from the cut buffer is limited
 by the
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index f93fa8e..e032950 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -467,6 +467,6 @@ driver first appeared in
 .An -nosplit
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index 6c61735..45d5e59 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -139,7 +139,7 @@ It was rewritten
 for
 .Fx 5.0
 by
-.An Nate Lawson Aq nate@root.org .
+.An Nate Lawson Aq Mt nate@root.org .
 .Sh BUGS
 Currently, only the
 .Xr ahc 4
diff --git a/share/man/man4/tdfx.4 b/share/man/man4/tdfx.4
index b785c75..2a09a71 100644
--- a/share/man/man4/tdfx.4
+++ b/share/man/man4/tdfx.4
@@ -80,14 +80,14 @@ and was originally developed for Linux kernel 2.0.x, later written for
 .Sh AUTHORS
 .An -nosplit
 The driver was developed by
-.An Coleman Kane Aq cokane@micro.ti.com
+.An Coleman Kane Aq Mt cokane@micro.ti.com
 after the linux version of this driver by
 .An Darryll Straus ,
 .An John Taylor ,
 .An Jens Axboe ,
-.An Carlo Wood Aq carlo@alinoe.com
+.An Carlo Wood Aq Mt carlo@alinoe.com
 and
-.An Joseph Kain Aq joseph@3dfx.com
+.An Joseph Kain Aq Mt joseph@3dfx.com
 to be directly compatible with it and support the many GLIDE based games
 available for Linux and
 .Ux .
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index f415459..a589ec0 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -416,10 +416,10 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@bsdi.com .
+.An Bill Paul Aq Mt wpaul@bsdi.com .
 The header splitting firmware modifications, character
 .Xr ioctl 2
 interface and debugging support were written by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
 Initial zero copy support was written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org .
+.An Andrew Gallatin Aq Mt gallatin@FreeBSD.org .
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 0716ce0..d971dcd 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -182,4 +182,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4
index 6180c94..6d88720 100644
--- a/share/man/man4/trm.4
+++ b/share/man/man4/trm.4
@@ -104,4 +104,4 @@ of Tekram Technology,
 and ported to
 .Fx 5.0
 by
-.An Olivier Houchard Aq cognet@FreeBSD.org .
+.An Olivier Houchard Aq Mt cognet@FreeBSD.org .
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 32cccfc..dbafe91 100644
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
@@ -132,4 +132,4 @@ messages, the quantity of which varies depending on the value assigned to
 The
 .Nm
 driver and manpage were written by
-.An Vinod Kashyap Aq vkashyap@FreeBSD.org .
+.An Vinod Kashyap Aq Mt vkashyap@FreeBSD.org .
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index fc73a01..9f2eadf 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -258,15 +258,12 @@ and outstanding commands were restarted.
 The
 .Nm
 driver and manual page were written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 Extensive work done on the driver by
-.An Vinod Kashyap
-.Aq vkashyap@FreeBSD.org
+.An Vinod Kashyap Aq Mt vkashyap@FreeBSD.org
 and
-.An Paul Saab
-.Aq ps@FreeBSD.org .
+.An Paul Saab Aq Mt ps@FreeBSD.org .
 .Sh BUGS
 The controller cannot handle I/O transfers
 that are not aligned to a 512-byte boundary.
diff --git a/share/man/man4/tws.4 b/share/man/man4/tws.4
index 3f2ab66..40e49bd8 100644
--- a/share/man/man4/tws.4
+++ b/share/man/man4/tws.4
@@ -114,5 +114,5 @@ The
 driver was written by
 .An Manjunath Ranganathaiah
 for LSI and this manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4
index d83f157..0663a9a 100644
--- a/share/man/man4/u3g.4
+++ b/share/man/man4/u3g.4
@@ -111,15 +111,16 @@ driver appeared in
 is based on the
 .Xr uark 4
 driver, and written by
-.An Andrea Guzzo Aq aguzzo@anywi.com
+.An Andrea Guzzo Aq Mt aguzzo@anywi.com
 in September 2008.
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Andrea Guzzo Aq aguzzo@anywi.com
+.An Andrea Guzzo Aq Mt aguzzo@anywi.com
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 Hardware for testing was provided by AnyWi Technologies, Leiden, NL.
 .Sh BUGS
 The automatic mode switch from disk mode to modem mode does not work unless
diff --git a/share/man/man4/uark.4 b/share/man/man4/uark.4
index a4e2e56..b130ff1 100644
--- a/share/man/man4/uark.4
+++ b/share/man/man4/uark.4
@@ -75,8 +75,7 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Jonathan Gray
-.Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
 .Sh CAVEATS
 Setting hardware flow control is not currently supported.
 It is not yet known how to ask the hardware to send a break.
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 644c37d..748d6cb 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -178,4 +178,4 @@ device driver first appeared in
 The
 .Nm
 device driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index e93094e..07cdc28 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -175,11 +175,11 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong Aq weongyo@FreeBSD.org
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org
 and
-.An Sam Leffler Aq sam@FreeBSD.org .
+.An Sam Leffler Aq Mt sam@FreeBSD.org .
 It is distantly related to a driver written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 Atheros proprietary 108 Mbps mode (aka Super AG mode) is not supported.
 .Pp
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index df9002c..12a18f0 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -96,14 +96,14 @@ The
 manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002 and modified for the
 .Nm
 driver by
-.An Alexander Kabaev Aq kan@FreeBSD.org
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org
 in October 2002.
 .Sh AUTHORS
 The
 .Nm
 driver was written by
-.An Alexander Kabaev Aq kan@FreeBSD.org .
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org .
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index 8451c6f..0337124 100644
--- a/share/man/man4/ubtbcmfw.4
+++ b/share/man/man4/ubtbcmfw.4
@@ -102,7 +102,7 @@ The
 driver was implemented in
 .Fx 5.0 .
 .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/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index 8898872..9be0294 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -94,7 +94,7 @@ in March of 2002.
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
 .Sh BUGS
 Prior to
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 063d419..8ec0a48 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -84,4 +84,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index 4d90236..5f6c80c 100644
--- a/share/man/man4/udav.4
+++ b/share/man/man4/udav.4
@@ -98,4 +98,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Shingo WATANABE Aq nabe@nabechan.org .
+.An Shingo WATANABE Aq Mt nabe@nabechan.org .
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index 45afd79..b455901 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -115,10 +115,10 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Doug Ambrisko Aq ambrisko@whistle.com ,
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Doug Ambrisko Aq Mt ambrisko@whistle.com ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/uep.4 b/share/man/man4/uep.4
index 74b65f3..231abb7 100644
--- a/share/man/man4/uep.4
+++ b/share/man/man4/uep.4
@@ -71,7 +71,7 @@ creates a blocking pseudo\-device file,
 The
 .Nm
 driver was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
 .Sh BUGS
 .Nm
 can't act like
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index 7ae11bd..a06d45c 100644
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@@ -80,6 +80,6 @@ blocking device node
 The
 .Nm
 driver was written by
-.An M. Warner Losh Aq imp@FreeBSD.org
+.An M. Warner Losh Aq Mt imp@FreeBSD.org
 for
 .Fx .
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 6c8b659..9fcd4d4 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -62,7 +62,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@carlstedt.se
+.An Lennart Augustsson Aq Mt augustss@carlstedt.se
 for the
 .Nx
 project.
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index b6274ba..fc90fff 100644
--- a/share/man/man4/uhid.4
+++ b/share/man/man4/uhid.4
@@ -143,5 +143,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/uhso.4 b/share/man/man4/uhso.4
index cc2e9ae..37f7dc3 100644
--- a/share/man/man4/uhso.4
+++ b/share/man/man4/uhso.4
@@ -139,4 +139,4 @@ AT_OWANCALL=1,0,1
 The
 .Nm
 driver was written by
-.An Fredrik Lindberg Aq fli@shapeshifter.se .
+.An Fredrik Lindberg Aq Mt fli@shapeshifter.se .
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 71ee348..3a3125d 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -157,15 +157,15 @@ driver to the kernel.
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@cs.chalmers.se
+.An Lennart Augustsson Aq Mt augustss@cs.chalmers.se
 for
 .Nx
 and was substantially rewritten for
 .Fx
 by
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org
 with a large amount of input from
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4
index cd3b300..894211b 100644
--- a/share/man/man4/ulpt.4
+++ b/share/man/man4/ulpt.4
@@ -106,5 +106,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index e57849e..b4c08d7 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -254,9 +254,9 @@ when using
 The
 .Nm
 driver was written by
-.An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp
+.An MAEKAWA Masahide Aq Mt bishop@rr.iij4u.or.jp
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4
index fc96ad2..f94e359 100644
--- a/share/man/man4/umcs.4
+++ b/share/man/man4/umcs.4
@@ -94,8 +94,7 @@ appeared in ports since December of 2010.
 The
 .Nm
 driver was written by
-.An Lev Serebryakov
-.Aq lev@FreeBSD.org .
+.An Lev Serebryakov Aq Mt lev@FreeBSD.org .
 .Sh BUGS
 This driver doesn't support access to any fine tunes of
 chip, like RS522/RS485 mode, non-standard baudrates, etc.
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index e40e146..00e4e09 100644
--- a/share/man/man4/umct.4
+++ b/share/man/man4/umct.4
@@ -91,11 +91,11 @@ appeared in
 It is loosely based on the
 .Xr ubsa 4
 driver by
-.An Alexander Kabaev Aq kan@FreeBSD.org
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org
 with documentation from
-.An Wolfgang Grandeggar Aq wolfgang@cec.ch .
+.An Wolfgang Grandeggar Aq Mt wolfgang@cec.ch .
 .Sh AUTHORS
 The
 .Nm
 driver was written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
diff --git a/share/man/man4/umodem.4 b/share/man/man4/umodem.4
index 71827db..480b453 100644
--- a/share/man/man4/umodem.4
+++ b/share/man/man4/umodem.4
@@ -108,7 +108,7 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
 .Sh BUGS
 Only modems with multiplexed commands and data are supported
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 6c052a1..83aeeda 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -99,15 +99,15 @@ as in X change it to:
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@cs.chalmers.se
+.An Lennart Augustsson Aq Mt augustss@cs.chalmers.se
 for
 .Nx
 and was adopted for
 .Fx
 by
-.An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp .
+.An MAEKAWA Masahide Aq Mt bishop@rr.iij4u.or.jp .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org
 with input from
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 7b81438..c7d3ee5 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -209,7 +209,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Marcus Glocker Aq mglocker@openbsd.org .
+.An Marcus Glocker Aq Mt mglocker@openbsd.org .
 .Pp
 The hardware specification was reverse engineered by the people at
 .Pa http://www.prism54.org .
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index 7c2bce0..6ed2038 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -193,5 +193,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 4ae6c18..1563fde 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -158,7 +158,7 @@ driver first appeared in
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
 .Sh BUGS
 Host AP mode doesn't support client power save.
 Clients using power save mode will experience
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index 68a4964..30048c1 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -122,9 +122,9 @@ CFLAGS="-I/usr/include/dev/usb" ./configure \\
 The
 .Nm
 driver was written by
-.An Iwasa Kazmi Aq kzmi@ca2.so-net.ne.jp
+.An Iwasa Kazmi Aq Mt kzmi@ca2.so-net.ne.jp
 for
 .Fx .
 .Pp
 This manual page was written by
-.An Dirk-Willem van Gulik Aq dirkx@webweaving.org .
+.An Dirk-Willem van Gulik Aq Mt dirkx@webweaving.org .
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index 58f291f..a67235e 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -122,5 +122,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index da1db76..223dbbc 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -150,7 +150,7 @@ and
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index f64d8b8..4db0d73 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -175,8 +175,11 @@ module complies with the USB 2.0 standard.
 .Sh HISTORY
 The
 .Nm
-module has been inspired by the NetBSD USB stack initially written by
-Lennart Augustsson. The
+module has been inspired by the
+.Nx
+USB stack initially written by
+.An Lennart Augustsson .
+The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man4/usb_quirk.4 b/share/man/man4/usb_quirk.4
index eb45eaa..9352e76 100644
--- a/share/man/man4/usb_quirk.4
+++ b/share/man/man4/usb_quirk.4
@@ -191,6 +191,6 @@ The
 module appeared in
 .Fx 8.0 ,
 and was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/usb_template.4 b/share/man/man4/usb_template.4
index 331ece9..e4dba2c 100644
--- a/share/man/man4/usb_template.4
+++ b/share/man/man4/usb_template.4
@@ -80,4 +80,4 @@ module complies to the USB 1.0, 2.0 and 3.0 standard.
 The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4
index d043cb2..01eb93d 100644
--- a/share/man/man4/uslcom.4
+++ b/share/man/man4/uslcom.4
@@ -209,4 +209,4 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Jonathan Gray Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
diff --git a/share/man/man4/utopia.4 b/share/man/man4/utopia.4
index 00020ea..b3c0e5b 100644
--- a/share/man/man4/utopia.4
+++ b/share/man/man4/utopia.4
@@ -193,4 +193,4 @@ may be needed for interworking with public networks.
 .Xr patm 4 ,
 .Xr utopia 9
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index 2397e45..254e9b5 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -131,7 +131,7 @@ in August 2002.
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 at that time.
 .Sh BUGS
 The code to provide multiple
diff --git a/share/man/man4/uvscom.4 b/share/man/man4/uvscom.4
index be40518..fb8ada7 100644
--- a/share/man/man4/uvscom.4
+++ b/share/man/man4/uvscom.4
@@ -91,5 +91,5 @@ and later in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index b102d2f..cf4179b 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -178,8 +178,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 This manual page was written by
 .An Kazutaka Yokota .
diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4
index f8fd8f7..7363b95 100644
--- a/share/man/man4/vge.4
+++ b/share/man/man4/vge.4
@@ -222,4 +222,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/viapm.4 b/share/man/man4/viapm.4
index 851c1fc..a155e91 100644
--- a/share/man/man4/viapm.4
+++ b/share/man/man4/viapm.4
@@ -67,6 +67,6 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Nicolas Souchu Aq nsouch@FreeBSD.org .
+.An Nicolas Souchu Aq Mt nsouch@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/viawd.4 b/share/man/man4/viawd.4
index 47473cf..e579bf0 100644
--- a/share/man/man4/viawd.4
+++ b/share/man/man4/viawd.4
@@ -76,4 +76,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Fabien Thomas Aq fabient@FreeBSD.org .
+.An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4
index 10ebf20..8a0cbc6 100644
--- a/share/man/man4/virtio.4
+++ b/share/man/man4/virtio.4
@@ -94,4 +94,4 @@ Support for VirtIO first appeared in
 .An -nosplit
 .Fx
 support for VirtIO was first added by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
diff --git a/share/man/man4/virtio_balloon.4 b/share/man/man4/virtio_balloon.4
index 450b5cd..b7ce0ed 100644
--- a/share/man/man4/virtio_balloon.4
+++ b/share/man/man4/virtio_balloon.4
@@ -59,6 +59,6 @@ The hypervisor can later signal the balloon to return the memory.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
diff --git a/share/man/man4/virtio_blk.4 b/share/man/man4/virtio_blk.4
index eb5fded..579fb4a 100644
--- a/share/man/man4/virtio_blk.4
+++ b/share/man/man4/virtio_blk.4
@@ -87,6 +87,6 @@ be toggled between writethrough and writeback.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
diff --git a/share/man/man4/virtio_random.4 b/share/man/man4/virtio_random.4
index a20e868..5ce7d17 100644
--- a/share/man/man4/virtio_random.4
+++ b/share/man/man4/virtio_random.4
@@ -58,4 +58,4 @@ hypervisor to the guest.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
diff --git a/share/man/man4/virtio_scsi.4 b/share/man/man4/virtio_scsi.4
index b136de6..f65f8b7 100644
--- a/share/man/man4/virtio_scsi.4
+++ b/share/man/man4/virtio_scsi.4
@@ -87,6 +87,6 @@ Enable tracing prints.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 10.0 .
diff --git a/share/man/man4/vkbd.4 b/share/man/man4/vkbd.4
index debdd3e..78110a6 100644
--- a/share/man/man4/vkbd.4
+++ b/share/man/man4/vkbd.4
@@ -136,7 +136,7 @@ The
 module was implemented in
 .Fx 6.0 .
 .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/share/man/man4/vmx.4 b/share/man/man4/vmx.4
index 0598aa8..974c3f8 100644
--- a/share/man/man4/vmx.4
+++ b/share/man/man4/vmx.4
@@ -148,7 +148,7 @@ The
 driver was ported from
 .Ox
 and significantly rewritten by
-.An Bryan Venteicher Aq bryanv@freebsd.org .
+.An Bryan Venteicher Aq Mt bryanv@freebsd.org .
 The
 .Ox
 driver was written by
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 1390cc9..da4ee5b 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -203,7 +203,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4
index 10be590..809ca07 100644
--- a/share/man/man4/vt.4
+++ b/share/man/man4/vt.4
@@ -212,15 +212,15 @@ terminal initialization information
 The
 .Nm
 device driver was developed by
-.An Ed Schouten Aq ed@FreeBSD.org ,
-.An Ed Maste Aq emaste@FreeBSD.org ,
+.An Ed Schouten Aq Mt ed@FreeBSD.org ,
+.An Ed Maste Aq Mt emaste@FreeBSD.org ,
 and
-.An Aleksandr Rybalko Aq ray@FreeBSD.org ,
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org ,
 with sponsorship provided by the
 .Fx
 Foundation.
 This manual page was written by
-.An Warren Block <wblock@FreeBSD.org>.
+.An Warren Block Aq Mt wblock@FreeBSD.org .
 .Sh CAVEATS
 Paste buffer size is limited by the system value
 .Brq Dv MAX_INPUT ,
diff --git a/share/man/man4/vte.4 b/share/man/man4/vte.4
index 18b39d0..23080a0 100644
--- a/share/man/man4/vte.4
+++ b/share/man/man4/vte.4
@@ -146,7 +146,6 @@ Show hardware MAC statistics maintained in driver.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 8.3 .
diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4
index d3d7bc8..8825049 100644
--- a/share/man/man4/vtnet.4
+++ b/share/man/man4/vtnet.4
@@ -105,7 +105,7 @@ The default value is 0.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
 .Sh CAVEATS
diff --git a/share/man/man4/vxge.4 b/share/man/man4/vxge.4
index fdca8e2..b21c350 100644
--- a/share/man/man4/vxge.4
+++ b/share/man/man4/vxge.4
@@ -98,7 +98,7 @@ For troubleshooting tips and FAQs, please visit
 .Pa http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous .
 .Pp
 For any issues please send an email to
-.Aq support@neterion.com .
+.Aq Mt support@neterion.com .
 .Sh SEE ALSO
 .Xr arp 8 ,
 .Xr ifconfig 8
@@ -106,5 +106,4 @@ For any issues please send an email to
 The
 .Nm
 driver was written by
-.An Neterion
-.Aq support@neterion.com .
+.An Neterion Aq Mt support@neterion.com .
diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4
index 4d953d6..cb592f5 100644
--- a/share/man/man4/watchdog.4
+++ b/share/man/man4/watchdog.4
@@ -137,11 +137,11 @@ code first appeared in
 The
 .Nm
 facility was written by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 The software watchdog code and this manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org .
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org .
 Some contributions were made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
 .Sh BUGS
 The
 .Dv WD_PASSIVE
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 22a6706..b0b4e78 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -180,7 +180,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 The Winbond chip seems to behave strangely in some cases when the
 link partner switches modes.
diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4
index 49290ff..058a407 100644
--- a/share/man/man4/wbwd.4
+++ b/share/man/man4/wbwd.4
@@ -110,4 +110,4 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Bjoern A. Zeeb Aq bz@FreeBSD.org .
+.An Bjoern A. Zeeb Aq Mt bz@FreeBSD.org .
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 92dedff..0e55e7b 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -330,7 +330,7 @@ device driver first appeared in
 The original
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 This man page comes from
 .Ox .
 .Sh CAVEATS
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index 76e797c..16d1f2e 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -216,4 +216,4 @@ and then rewrote it to support multi-mode devices,
 add the extensible frameworks
 for cryptographic, authentication, and access control plugins.
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index f1bc15e..f2d4251 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -132,8 +132,8 @@ The original
 driver was written for
 .Ox
 by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
-.An Benjamin Close Aq benjsc@FreeBSD.org
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
+.An Benjamin Close Aq Mt benjsc@FreeBSD.org
 ported
 .Nm
 to
diff --git a/share/man/man4/wsp.4 b/share/man/man4/wsp.4
index a74097c..24c9b77 100644
--- a/share/man/man4/wsp.4
+++ b/share/man/man4/wsp.4
@@ -87,4 +87,4 @@ types.
 The
 .Nm
 driver was written by
-.An Huang Wen Hui Aq huanghwh@gmail.com
+.An Huang Wen Hui Aq Mt huanghwh@gmail.com .
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index 0935884..51240d2 100644
--- a/share/man/man4/xe.4
+++ b/share/man/man4/xe.4
@@ -154,11 +154,11 @@ driver first appeared in
 The
 .Nm
 device driver was written by
-.An Scott Mitchell Aq rsm@FreeBSD.org .
+.An Scott Mitchell Aq Mt rsm@FreeBSD.org .
 This manual page was written by
-.An Scott Mitchell Aq rsm@FreeBSD.org ,
+.An Scott Mitchell Aq Mt rsm@FreeBSD.org ,
 and
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 Supported devices will fail to attach on some machines using the
 .Tn NEWCARD
diff --git a/share/man/man4/xen.4 b/share/man/man4/xen.4
index e053fc5..83b3d12 100644
--- a/share/man/man4/xen.4
+++ b/share/man/man4/xen.4
@@ -159,16 +159,16 @@ first appeared in
 .An -nosplit
 .Fx
 support for Xen was first added by
-.An Kip Macy Aq kmacy@FreeBSD.org
+.An Kip Macy Aq Mt kmacy@FreeBSD.org
 and
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 Further refinements were made by
-.An Justin Gibbs Aq gibbs@FreeBSD.org ,
-.An Adrian Chadd Aq adrian@FreeBSD.org ,
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org ,
+.An Adrian Chadd Aq Mt adrian@FreeBSD.org ,
 and
-.An Colin Percival Aq cperciva@FreeBSD.org .
+.An Colin Percival Aq Mt cperciva@FreeBSD.org .
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Sh BUGS
 .Fx
 is only able to run as a Xen guest (DomU) and not as a Xen host (Dom0).
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index d10d270..81cf711 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -267,4 +267,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4
index d7f4609..a0c1c60 100644
--- a/share/man/man4/xnb.4
+++ b/share/man/man4/xnb.4
@@ -97,14 +97,13 @@ The
 device driver first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Alan Somers
-.Aq alans@spectralogic.com
+.An Alan Somers Aq Mt alans@spectralogic.com
 and
-.An John Suykerbuyk
-.Aq johns@spectralogic.com .
+.An John Suykerbuyk Aq Mt johns@spectralogic.com .
 .Sh CAVEATS
 Packets sent through Xennet pass over shared memory, so the protocol includes
 no form of link-layer checksum or CRC.
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index e670acb..c15ca4b 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -105,4 +105,4 @@ None.
 The CAM transport layer driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 5a1f0a5..178adfb 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -175,10 +175,10 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Florian Stoehr Aq ich@florian-stoehr.de ,
-.An Damien Bergamini Aq damien@openbsd.org ,
+.An Florian Stoehr Aq Mt ich@florian-stoehr.de ,
+.An Damien Bergamini Aq Mt damien@openbsd.org ,
 and
-.An Jonathan Gray Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
author	bapt <bapt@FreeBSD.org>	2014-06-26 21:46:14 +0000
committer	bapt <bapt@FreeBSD.org>	2014-06-26 21:46:14 +0000
commit	5da5395a98758fa50d5c1b8a2b98e63e6021ccac (patch)
tree	023fa0b0ff2a8ca1fc93dd3b0d5e142b36f3e19c
parent	c6d679e670d0710831f1978b7d379e5cec49186a (diff)
download	FreeBSD-src-5da5395a98758fa50d5c1b8a2b98e63e6021ccac.zip FreeBSD-src-5da5395a98758fa50d5c1b8a2b98e63e6021ccac.tar.gz