From: Franco Fichtner <franco@lastsummer.de>
Date: Wed, 24 Jul 2013 20:00:40 +0000 (+0200)
Subject: man4: use .Mt for emails (2/2)
X-Git-Tag: v3.7.0~745
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/b2a6f486d003bab74d4d1f092305b989b004d42f

man4: use .Mt for emails (2/2)

This concludes the efforts to consistently use .Mt for
email addresses.  It also sneaks in a couple of subtle
changes to punctuation, grammar and conversion of
'.Nm xxx' to '.Xr xxx 4' where appropriate.
---

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 7a9fbfe35f..381f45487b 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -288,10 +288,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/acpi.4 b/share/man/man4/acpi.4
index 9b6b993b9d..ffd0326a72 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -613,16 +613,16 @@ The following people made notable contributions to the ACPI subsystem
 in
 .Dx :
 .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 7d8a3e442b..4c86756c05 100644
--- a/share/man/man4/acpi_asus.4
+++ b/share/man/man4/acpi_asus.4
@@ -173,13 +173,13 @@ 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
 started by
-.An Julien Lerouge
-which maintains a driver implementing this
+.An Julien Lerouge ,
+who maintains a driver implementing this
 functionality in the
 .Tn Linux
 kernel.
diff --git a/share/man/man4/acpi_fujitsu.4 b/share/man/man4/acpi_fujitsu.4
index cff28251e1..945b4ee960 100644
--- a/share/man/man4/acpi_fujitsu.4
+++ b/share/man/man4/acpi_fujitsu.4
@@ -168,10 +168,10 @@ It was then ported to
 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 884cce5929..5a9dd29e0a 100644
--- a/share/man/man4/acpi_hp.4
+++ b/share/man/man4/acpi_hp.4
@@ -263,7 +263,7 @@ to
 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.
@@ -277,7 +277,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 an
 .Tn HP Compaq 8510p
diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4
index 0af5fdd31b..80e66c260f 100644
--- a/share/man/man4/acpi_panasonic.4
+++ b/share/man/man4/acpi_panasonic.4
@@ -175,6 +175,6 @@ It was then ported to
 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_sony.4 b/share/man/man4/acpi_sony.4
index b5b210a9f5..0bc16802c3 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -81,4 +81,4 @@ It was then ported to
 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_thinkpad.4 b/share/man/man4/acpi_thinkpad.4
index 0da83cc05b..169c2c2314 100644
--- a/share/man/man4/acpi_thinkpad.4
+++ b/share/man/man4/acpi_thinkpad.4
@@ -464,10 +464,10 @@ and was imported into
 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_toshiba.4 b/share/man/man4/acpi_toshiba.4
index b5109a5a49..3a5b665d3e 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 cc470d35e7..4cba8a16fc 100644
--- a/share/man/man4/acpi_video.4
+++ b/share/man/man4/acpi_video.4
@@ -24,7 +24,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/acpi_video.4,v 1.4 2005/07/15 17:35:25 hrs Exp $
-.\" $DragonFly: src/share/man/man4/acpi_video.4,v 1.1 2008/08/28 09:47:04 hasso Exp $
 .\"
 .Dd November 8, 2004
 .Dt ACPI_VIDEO 4
@@ -81,9 +80,9 @@ and was imported into
 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 94679838dd..7c7b6f97e3 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -85,12 +85,13 @@ 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
+Work has been inspired by the Linux acpi-wmi driver written by
+.An Carlos Corbacho .
 .Pp
 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/ae.4 b/share/man/man4/ae.4
index ba9ee2a2ff..2ddc6cb080 100644
--- a/share/man/man4/ae.4
+++ b/share/man/man4/ae.4
@@ -128,8 +128,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 afa879f2b8..6af4b1c551 100644
--- a/share/man/man4/aesni.4
+++ b/share/man/man4/aesni.4
@@ -91,7 +91,7 @@ by
 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 f69b7976c8..bcc323be26 100644
--- a/share/man/man4/age.4
+++ b/share/man/man4/age.4
@@ -160,7 +160,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 32a0c2fd99..e26b3c72a2 100644
--- a/share/man/man4/ahci.4
+++ b/share/man/man4/ahci.4
@@ -120,14 +120,14 @@ driver first appeared in
 The
 .Nm
 driver was originally written by
-.An David Gwynne Aq dlg@openbsd.org
+.An David Gwynne Aq Mt dlg@openbsd.org
 and
-.An Christopher Pascoe Aq pascoe@openbsd.org
+.An Christopher Pascoe Aq Mt pascoe@openbsd.org
 for
 .Ox .
 .Pp
 It was ported to
 .Dx
 by
-.An Matt Dillon Aq dillon@apollo.backplane.com
+.An Matt Dillon Aq Mt dillon@apollo.backplane.com ,
 who added new features such as hot-plug and port multiplier support.
diff --git a/share/man/man4/alc.4 b/share/man/man4/alc.4
index 90433c3c32..cc49ee78d1 100644
--- a/share/man/man4/alc.4
+++ b/share/man/man4/alc.4
@@ -155,8 +155,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 8.0 .
 .Pp
diff --git a/share/man/man4/ale.4 b/share/man/man4/ale.4
index 22dc5468eb..e8063de474 100644
--- a/share/man/man4/ale.4
+++ b/share/man/man4/ale.4
@@ -138,7 +138,6 @@ Value 0 completely disables the interrupt moderation.
 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 e2eada7aef..b4928f6c92 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 f3a11414c6..7a1fcf5992 100644
--- a/share/man/man4/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -61,12 +61,12 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This driver was written by
-.An "Matthew C. Forman" .
+.An Matthew C. Forman .
 Based heavily on the
-.Nm alpm
+.Xr alpm 4
 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 9abf6fd7d7..52978a4ea4 100644
--- a/share/man/man4/amdsbwd.4
+++ b/share/man/man4/amdsbwd.4
@@ -68,6 +68,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 5fad32abfc..1f2804b575 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/amr.4 b/share/man/man4/amr.4
index 32c3bfc8bb..a03a371526 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -241,9 +241,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 3c0acc9794..cdfc929747 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/an.4,v 1.5.2.6 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/an.4,v 1.5 2007/07/13 08:12:45 swildner Exp $
 .\"
 .Dd September 10, 1999
 .Dt AN 4
@@ -115,4 +114,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/apm.4 b/share/man/man4/apm.4
index 471c4bc088..c3b835a6bc 100644
--- a/share/man/man4/apm.4
+++ b/share/man/man4/apm.4
@@ -133,7 +133,7 @@ polls APM events and handles the following events.
 .Xr apm 8 ,
 .Xr zzz 8
 .Sh AUTHORS
-.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
+.An Tatsumi Hosokawa Aq Mt hosokawa@jp.FreeBSD.org
 .Sh BUGS
 WARNING!
 Many, if not most, of the implementations of APM-bios in laptops
diff --git a/share/man/man4/aps.4 b/share/man/man4/aps.4
index 6e84e6aa6d..8ffc14ff01 100644
--- a/share/man/man4/aps.4
+++ b/share/man/man4/aps.4
@@ -101,7 +101,7 @@ support was added in
 The
 .Nm
 driver was written by
-.An Jonathan Gray Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
 It was adapted to
 .Dx
 by
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index 7dd116e12d..8935339571 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -177,7 +177,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/asr.4 b/share/man/man4/asr.4
index e1043e5d34..4bded84edc 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/atkbd.4 b/share/man/man4/atkbd.4
index a0a7e9be0a..3e6add9e7d 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -25,7 +25,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/atkbd.4,v 1.12.2.5 2001/08/17 13:08:36 ru Exp $
-.\" $DragonFly: src/share/man/man4/atkbd.4,v 1.6 2007/05/17 08:19:01 swildner Exp $
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
@@ -200,8 +199,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 465881b067..eb6c3e96b0 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -25,7 +25,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/atkbdc.4,v 1.9.2.4 2001/08/17 13:08:37 ru Exp $
-.\" $DragonFly: src/share/man/man4/atkbdc.4,v 1.2 2003/06/17 04:36:58 dillon Exp $
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
@@ -112,4 +111,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/aue.4 b/share/man/man4/aue.4
index d52f008f31..b4932cdd88 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/aue.4,v 1.7.2.7 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/aue.4,v 1.4 2008/05/02 02:05:05 swildner Exp $
 .\"
 .Dd December 25, 1999
 .Dt AUE 4
@@ -145,4 +144,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 78c5ea0011..7cc6c81af3 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/axe.4,v 1.12 2005/10/07 02:32:15 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/axe.4,v 1.4 2007/02/25 12:03:07 swildner Exp $
 .\"
 .Dd July 16, 2005
 .Dt AXE 4
@@ -174,4 +173,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/bce.4 b/share/man/man4/bce.4
index f0787f90eb..09f01cf7eb 100644
--- a/share/man/man4/bce.4
+++ b/share/man/man4/bce.4
@@ -364,8 +364,9 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An David Christensen Aq davidch@broadcom.com .
-Sepherosa Ziehau added receive side scaling,
+.An David Christensen Aq Mt davidch@broadcom.com .
+.An Sepherosa Ziehau
+added receive side scaling,
 multiple transmission queues
 and multiple vector MSI-X support to
 .Dx .
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index af94115cdd..d947b7fd0f 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -30,7 +30,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/bge.4,v 1.1.2.4 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/bge.4,v 1.10 2008/07/11 10:38:50 thomas Exp $
 .\"
 .Dd March 4, 2007
 .Dt BGE 4
@@ -224,4 +223,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/bktr.4 b/share/man/man4/bktr.4
index 4e02e43069..c299aece77 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -241,10 +241,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/bnx.4 b/share/man/man4/bnx.4
index 86a369c3a3..269b10e434 100644
--- a/share/man/man4/bnx.4
+++ b/share/man/man4/bnx.4
@@ -373,9 +373,9 @@ The
 driver was based on
 .Xr bge 4
 written by
-.An Bill Paul
-.Aq wpaul@windriver.com .
-Sepherosa Ziehau added receive side scaling,
+.An Bill Paul Aq Mt wpaul@windriver.com .
+.An Sepherosa Ziehau
+added receive side scaling,
 multiple transmission queues
 and multiple MSI-X support to
 .Dx .
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index b9780491d0..69af8f7d81 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -219,16 +219,14 @@ in 2011.
 The
 .Nm
 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 .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 5bc29ba51a..7358af7e60 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/share/man/man4/ch.4,v 1.18.2.7 2001/08/17 13:08:37 ru Exp $
-.\" $DragonFly: src/share/man/man4/ch.4,v 1.12 2008/05/02 02:05:05 swildner Exp $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
@@ -335,13 +334,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 bd9a0ee79f..a5405b4f4b 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -190,7 +190,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/cmx.4 b/share/man/man4/cmx.4
index 8d821ac655..3dbeeca0a8 100644
--- a/share/man/man4/cmx.4
+++ b/share/man/man4/cmx.4
@@ -25,7 +25,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/cmx.4,v 1.2 2008/03/06 08:47:16 rink Exp $
-.\" $DragonFly: src/share/man/man4/cmx.4,v 1.2 2008/04/29 11:59:08 swildner Exp $
 .\"
 .Dd July 7, 2007
 .Dt CMX 4
@@ -106,13 +105,13 @@ and was imported into
 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 .
+Omnikey GmbH,
+.Pa 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
 .Nm
 driver talks to the CardMan 4040 is a bit rough.  Due to the
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index 4ce5714031..edf9f7a7a6 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -75,7 +75,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/csa.4 b/share/man/man4/csa.4
index 4bc02247f5..4ce86f6fc2 100644
--- a/share/man/man4/csa.4
+++ b/share/man/man4/csa.4
@@ -24,7 +24,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/csa.4,v 1.3.2.4 2002/07/15 22:15:18 blackend Exp $
-.\" $DragonFly: src/share/man/man4/csa.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
 .\"
 .Dd December 18, 1999
 .Dt CSA 4
@@ -61,4 +60,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/cue.4 b/share/man/man4/cue.4
index 904827aa85..71303b7161 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/cue.4,v 1.7.2.10 2004/03/01 09:23:45 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/cue.4,v 1.5 2007/03/04 02:32:59 swildner Exp $
 .\"
 .Dd January 13, 2000
 .Dt CUE 4
@@ -85,4 +84,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/cxm.4 b/share/man/man4/cxm.4
index 135179b19c..cd462093e0 100644
--- a/share/man/man4/cxm.4
+++ b/share/man/man4/cxm.4
@@ -168,6 +168,6 @@ by
 .Sh AUTHORS
 .An -nosplit
 This driver was made by
-.An John Wehle Aq john@feith.com
+.An John Wehle Aq Mt john@feith.com
 and this manual page was made by
-.An Edwin Groothuis Aq edwin@FreeBSD.org .
+.An Edwin Groothuis Aq Mt edwin@FreeBSD.org .
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 07ca9a6185..3f421ef88d 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -300,7 +300,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 2bc9e6a428..c66cc4df71 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -23,7 +23,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/dcons.4,v 1.5 2004/06/17 19:51:17 ru Exp $
-.\" $DragonFly: src/share/man/man4/dcons.4,v 1.3 2006/04/17 18:01:37 swildner Exp $
 .\"
 .Dd February 11, 2003
 .Dt DCONS 4
@@ -95,7 +94,7 @@ for more details.
 .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 b0adf714c9..5ec2154636 100644
--- a/share/man/man4/dcons_crom.4
+++ b/share/man/man4/dcons_crom.4
@@ -23,7 +23,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/dcons_crom.4,v 1.4 2004/06/17 19:51:17 ru Exp $
-.\" $DragonFly: src/share/man/man4/dcons_crom.4,v 1.1 2004/09/23 06:44:30 simokawa Exp $
 .\"
 .Dd June 16, 2003
 .Dt DCONS_CROM 4
@@ -52,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 e33cd81b74..27d4db1c6a 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/share/man/man4/divert.4,v 1.15.2.7 2002/03/13 18:38:44 keramida Exp $
-.\" $DragonFly: src/share/man/man4/divert.4,v 1.5 2007/12/08 10:20:45 sephe Exp $
 .\"
 .Dd June 18, 1996
 .Dt DIVERT 4
@@ -151,7 +150,7 @@ that was not associated with any interface.
 .Xr socket 2 ,
 .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/dm.4 b/share/man/man4/dm.4
index 906461fc4b..c631a0d014 100644
--- a/share/man/man4/dm.4
+++ b/share/man/man4/dm.4
@@ -130,14 +130,17 @@ It was then brought into
 by
 .An Alex Hornung .
 .Sh AUTHORS
-.An Adam Hamsik Aq haad@NetBSD.org
-implemented the device-mapper driver for
+.An -nosplit
+.An Adam Hamsik Aq Mt haad@NetBSD.org
+implemented the
+.Nm
+driver for
 .Nx .
 .Pp
-.An Brett Blymn Aq blymn@NetBSD.org ,
-.An Reinoud Zandijk Aq reinoud@NetBSD.org ,
+.An Brett Blymn Aq Mt blymn@NetBSD.org ,
+.An Reinoud Zandijk Aq Mt reinoud@NetBSD.org ,
 and
-.An Bill Stouder-Studenmund Aq wrstuden@NetBSD.org
+.An Bill Stouder-Studenmund Aq Mt wrstuden@NetBSD.org
 provided guidance and answered questions about the
 .Nx
 implementation.
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 915d6659a1..6a48393833 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -1,6 +1,5 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.4.2.12 2002/11/18 21:51:16 luigi Exp $
-.\" $DragonFly: src/share/man/man4/dummynet.4,v 1.3 2007/10/16 11:28:40 sephe Exp $
 .\"
 .Dd October 28, 2002
 .Dt DUMMYNET 4
@@ -61,7 +60,7 @@ which is set to 1000 by default.
 .Nm
 was initially implemented as a testing tool for 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 then modified to work at the ip and bridging
 level, integrated with the IPFW packet filter, and extended to
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index 7511456bc4..ae588bd2c3 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -24,7 +24,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/modules/if_ef/ef.4,v 1.1.2.2 2001/12/20 17:23:13 ru Exp $
-.\" $DragonFly: src/share/man/man4/ef.4,v 1.1 2005/11/22 09:36:58 swildner Exp $
 .\"
 .Dd June 20, 1999
 .Dt EF 4
@@ -100,4 +99,4 @@ driver is loaded.
 .Xr ipx 3 ,
 .Xr ifconfig 8
 .Sh AUTHORS
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index eaab550cdb..1da21dfee7 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -413,7 +413,7 @@ This sysctl only applies to
 .\"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 freebsdnic@mailbox.intel.com .
+.\".Aq Mt freebsdnic@mailbox.intel.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
@@ -436,7 +436,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsdnic@mailbox.intel.com .
+.An Intel Corporation Aq Mt freebsdnic@mailbox.intel.com .
 .Pp
 The
 .Nm emx
diff --git a/share/man/man4/et.4 b/share/man/man4/et.4
index e16fb8797e..136afcef2f 100644
--- a/share/man/man4/et.4
+++ b/share/man/man4/et.4
@@ -28,8 +28,6 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/share/man/man4/et.4,v 1.5 2008/07/09 18:15:09 thomas Exp $
-.\"
 .Dd July 9, 2008
 .Dt ET 4
 .Os
@@ -161,5 +159,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Sepherosa Ziehau
-.Aq sepherosa@gmail.com .
+.An Sepherosa Ziehau Aq Mt sepherosa@gmail.com .
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index bb4a7ffa80..bdf8a6b7cc 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/gdb.4,v 1.9 2004/01/28 00:02:10 grog Exp $
-.\" $DragonFly: src/share/man/man4/gdb.4,v 1.4 2006/10/14 23:06:42 swildner Exp $
 .\"
 .Dd December 30, 2003
 .Dt GDB 4
@@ -588,7 +587,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/gre.4 b/share/man/man4/gre.4
index bf2368aa23..aec1cb011b 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -307,7 +307,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 gre_compute_route
diff --git a/share/man/man4/hpt27xx.4 b/share/man/man4/hpt27xx.4
index 8868d4a32e..99716dcd65 100644
--- a/share/man/man4/hpt27xx.4
+++ b/share/man/man4/hpt27xx.4
@@ -98,7 +98,7 @@ device driver first appeared in
 The
 .Nm
 device driver was written by
-.An HighPoint Technologies, Inc. .
+.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/ichsmb.4 b/share/man/man4/ichsmb.4
index ac91ec81c4..b1b3ea7bc3 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ichsmb.4,v 1.3.2.3 2001/08/17 13:08:37 ru Exp $
-.\" $DragonFly: src/share/man/man4/ichsmb.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
 .\"
 .Dd October 5, 2000
 .Dt ICHSMB 4
@@ -54,4 +53,4 @@ and 82801BA (ICH2) PCI chips.
 .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 3e937019fc..9b84ee2660 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -82,8 +82,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 c637ba19c6..1078415f78 100644
--- a/share/man/man4/ida.4
+++ b/share/man/man4/ida.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/share/man/man4/ida.4,v 1.1.2.2 2003/03/03 18:51:16 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/ida.4,v 1.3 2007/04/04 18:36:55 swildner Exp $
 .\" Written by Tom Rhodes
 .\" This file is public domain
 .\"
@@ -66,8 +65,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 4fa8799905..86c1597864 100644
--- a/share/man/man4/igb.4
+++ b/share/man/man4/igb.4
@@ -428,7 +428,7 @@ is enabled on the device.
 .\"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 freebsdnic@mailbox.intel.com .
+.\".Aq Mt freebsdnic@mailbox.intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -449,4 +449,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsdnic@mailbox.intel.com .
+.An Intel Corporation Aq Mt freebsdnic@mailbox.intel.com .
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index bfe3f596bd..fc37dda92b 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -1,5 +1,4 @@
 .\" $FreeBSD: src/share/man/man4/iir.4,v 1.10 2006/06/19 15:22:34 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/iir.4,v 1.4 2007/04/04 18:36:55 swildner Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
@@ -66,13 +65,13 @@ from Intel.
 .Xr xpt 4 ,
 .Xr camcontrol 8
 .Sh AUTHORS
+.An -nosplit
 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 cd5f9186da..1419a3f3ce 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/ips.4 b/share/man/man4/ips.4
index de41ed0db5..f8e64cdbc1 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/it.4 b/share/man/man4/it.4
index 7541599426..e2d7cc4acb 100644
--- a/share/man/man4/it.4
+++ b/share/man/man4/it.4
@@ -1,5 +1,4 @@
 .\" $OpenBSD: it.4,v 1.8 2006/09/08 15:09:14 jmc Exp $
-.\" $DragonFly: src/share/man/man4/it.4,v 1.4 2007/10/26 08:22:00 swildner Exp $
 .\"
 .\" Copyright (c) 2003 Julien Bordet <zejames@greygats.org>
 .\" All rights reserved.
@@ -86,11 +85,11 @@ and was imported into
 The
 .Nm
 driver was written by
-.An Julien Bordet Aq zejames@greyhats.org .
+.An Julien Bordet Aq Mt zejames@greyhats.org .
 It was ported to
 .Fx
 by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org
+.An Constantine A. Murenin Aq Mt cnst@FreeBSD.org
 as a part of a Google Summer of Code 2007 project.
 .Sh BUGS
 Interrupt support is unimplemented.
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 4e7ec05346..a0eae2eb5a 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -159,4 +159,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 8c138a2d29..6c1b8e0a37 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -160,4 +160,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/ixgbe.4 b/share/man/man4/ixgbe.4
index 5ad9565058..bc8ca0a19c 100644
--- a/share/man/man4/ixgbe.4
+++ b/share/man/man4/ixgbe.4
@@ -113,7 +113,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 freebsdnic@mailbox.intel.com .
+.Aq Mt freebsdnic@mailbox.intel.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
@@ -131,4 +131,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsdnic@mailbox.intel.com .
+.An Intel Corporation Aq Mt freebsdnic@mailbox.intel.com .
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4
index 5fcf6edc57..b45ccc679f 100644
--- a/share/man/man4/jme.4
+++ b/share/man/man4/jme.4
@@ -275,12 +275,12 @@ is enabled on the device.
 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
 and was imported into
 .Dx 2.1 .
-Sepherosa Ziehau added the receive side scaling and
+.An Sepherosa Ziehau
+added the receive side scaling and
 multiple vector MSI-X support to
 .Dx .
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index b8ce9d70ce..bf41b1b23f 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -1,6 +1,5 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/joy.4,v 1.12.4.10 2002/07/22 14:21:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/joy.4,v 1.6 2008/05/02 02:05:05 swildner Exp $
 .\"
 .Dd January 23, 1995
 .Dt JOY 4
@@ -103,4 +102,4 @@ joystick device files
 The joystick 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 0e764d3f0b..d87679a39b 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -68,4 +68,4 @@ module was implemented in
 It was imported into
 .Dx 2.3 .
 .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/keyboard.4 b/share/man/man4/keyboard.4
index 067093a237..529bc4f75e 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -1,6 +1,5 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/keyboard.4,v 1.19.2.5 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/keyboard.4,v 1.5 2008/05/02 02:05:05 swildner Exp $
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4
@@ -171,4 +170,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 214dbf5ce7..40b68f7c64 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -24,7 +24,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/kld.4,v 1.5.2.6 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/kld.4,v 1.8 2008/09/02 11:50:46 matthias Exp $
 .\"
 .Dd August 6, 2009
 .Dt KLD 4
@@ -123,7 +122,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/kue.4 b/share/man/man4/kue.4
index 282ea9116f..13f5eb1344 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -29,7 +29,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/kue.4,v 1.7.2.7 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/kue.4,v 1.5 2007/03/04 02:32:59 swildner Exp $
 .\"
 .Dd January 4, 2000
 .Dt KUE 4
@@ -86,7 +85,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/lge.4 b/share/man/man4/lge.4
index 65dd99a8a5..93e50a5e5b 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -30,7 +30,6 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/lge.4,v 1.2.2.3 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/lge.4,v 1.4 2007/02/25 12:03:07 swildner Exp $
 .\"
 .Dd May 30, 2001
 .Dt LGE 4
@@ -142,4 +141,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/lm.4 b/share/man/man4/lm.4
index 0366e3afed..f4ef49d7ed 100644
--- a/share/man/man4/lm.4
+++ b/share/man/man4/lm.4
@@ -1,6 +1,5 @@
 .\" $OpenBSD: lm.4,v 1.16 2007/05/26 22:38:55 cnst Exp $
 .\" $NetBSD: lm.4,v 1.11 2001/09/22 01:22:49 wiz Exp $
-.\" $DragonFly: src/share/man/man4/lm.4,v 1.5 2007/10/26 08:22:00 swildner Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -111,15 +110,15 @@ driver was written by
 and ported to
 .Ox 3.4
 by
-.An Alexander Yurchenko Aq grange@openbsd.org .
+.An Alexander Yurchenko Aq Mt grange@openbsd.org .
 The driver was largely rewritten for
 .Ox 3.9
 by
-.An Mark Kettenis Aq kettenis@openbsd.org .
+.An Mark Kettenis Aq Mt kettenis@openbsd.org .
 The driver was then ported to
 .Fx
 by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org
+.An Constantine A. Murenin Aq Mt cnst@FreeBSD.org
 as a part of a Google Summer of Code 2007 project.
 .Sh CAVEATS
 Some vendors connect these chips to non-standard thermal diodes and
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index cdca4f98cb..2d75292158 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.17.2.4 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/ar.4,v 1.8 2008/07/09 16:23:55 thomas Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
@@ -111,9 +110,9 @@ device driver first appeared in
 The
 .Nm
 device driver was written by
-.An John Hay Aq jhay@FreeBSD.org .
+.An John Hay Aq Mt jhay@FreeBSD.org .
 Netgraph support was added by
-.An Julian Elischer Aq julian@FreeBSD.org .
+.An Julian Elischer Aq Mt julian@FreeBSD.org .
 .Sh BUGS
 At the moment only the V.35 and X.21 interfaces are tested.
 The others
@@ -122,4 +121,4 @@ may need tweaks to the clock selection code.
 The code can probably stand some optimizing.
 .Pp
 Please report bugs to
-.Aq jhay@FreeBSD.org .
+.Aq Mt jhay@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 5913dfb2f6..739ae7c07c 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -22,7 +22,6 @@
 .\" for fe driver.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.14.2.8 2001/10/10 11:43:53 murray Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/fe.4,v 1.5 2007/02/25 12:03:07 swildner Exp $
 .Dd March 3, 1996
 .Dt FE 4 i386
 .Os
@@ -253,15 +252,15 @@ 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
+.Xr ed 4
 driver written by
 .An David Greenman .
 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/glxsb.4 b/share/man/man4/man4.i386/glxsb.4
index 0fb08eabb6..2a1422d631 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/lnc.4 b/share/man/man4/man4.i386/lnc.4
index c041e0f91c..6cca08a746 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.4
@@ -35,7 +35,6 @@
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/le.4,v 1.2 2006/02/02 14:57:00 marius Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/lnc.4,v 1.7 2008/05/02 02:05:06 swildner Exp $
 .\"
 .Dd July 7, 2006
 .Dt LNC 4 i386
@@ -259,11 +258,11 @@ The
 driver was ported to
 .Fx
 by
-.An "Marius Strobl" Aq marius@FreeBSD.org
+.An Marius Strobl Aq Mt marius@FreeBSD.org
 and later ported to
 .Dx
 by
-.An "Bill Marquette" Aq bill.marquette@gmail.com .
+.An Bill Marquette Aq Mt bill.marquette@gmail.com .
 .\" .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/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index 8e9fd72f62..9324667d32 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/spic.4 b/share/man/man4/man4.i386/spic.4
index 7c0d0d9429..e609da461f 100644
--- a/share/man/man4/man4.i386/spic.4
+++ b/share/man/man4/man4.i386/spic.4
@@ -56,5 +56,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/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 5b6bd73c54..bd0395f6d6 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.15.2.4 2001/08/17 13:08:46 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/sr.4,v 1.9 2008/07/09 16:23:55 thomas Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
@@ -130,10 +129,10 @@ Choose a different one.
 The
 .Nm
 device driver was written by
-.An John Hay Aq jhay@FreeBSD.org .
+.An John Hay Aq Mt jhay@FreeBSD.org .
 .Pp
 Netgraph support was added by
-.An Julian Elischer Aq julian@FreeBSD.org .
+.An Julian Elischer Aq Mt julian@FreeBSD.org .
 .Sh BUGS
 At the moment only the X.21 interface is tested.
 The others
diff --git a/share/man/man4/man4.i386/viapm.4 b/share/man/man4/man4.i386/viapm.4
index 59b73a2378..e7f840470d 100644
--- a/share/man/man4/man4.i386/viapm.4
+++ b/share/man/man4/man4.i386/viapm.4
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/viapm.4,v 1.1.2.4 2002/10/10 19:17:58 ceri Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/viapm.4,v 1.3 2006/03/21 04:24:28 swildner Exp $
 .\"
 .Dd April 17, 2002
 .Dt VIAPM 4 i386
@@ -66,6 +65,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/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 479fa13344..112746dc0d 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -29,7 +29,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/vx.4,v 1.10.2.5 2001/08/17 13:08:46 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/vx.4,v 1.3 2006/02/17 19:37:10 swildner Exp $
 .\"
 .Dd January 15, 1996
 .Dt VX 4 i386
@@ -93,7 +92,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/md.4 b/share/man/man4/md.4
index 953e9c35cf..b1b2c961cf 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -6,7 +6,6 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" $FreeBSD: src/share/man/man4/md.4,v 1.3.2.4 2001/06/18 22:00:12 dd Exp $
-.\" $DragonFly: src/share/man/man4/md.4,v 1.5 2007/11/07 21:38:00 swildner Exp $
 .\"
 .Dd September 28, 2009
 .Dt MD 4
@@ -146,5 +145,4 @@ installation process.
 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/mfi.4 b/share/man/man4/mfi.4
index 6d0e796345..20826e7292 100644
--- a/share/man/man4/mfi.4
+++ b/share/man/man4/mfi.4
@@ -191,6 +191,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 8e1eaee0b9..440dfd904a 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -7,7 +7,6 @@
 .\" I doubt you would ever notice due to large differences.
 .\"
 .\" $FreeBSD: src/share/man/man4/miibus.4,v 1.3.2.6 2004/03/01 09:22:11 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/miibus.4,v 1.17 2008/07/26 17:03:53 swildner Exp $
 .\"
 .Dd July 26, 2008
 .Dt MIIBUS 4
@@ -157,4 +156,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/mlx.4 b/share/man/man4/mlx.4
index 84ab1692a6..7ba969391f 100644
--- a/share/man/man4/mlx.4
+++ b/share/man/man4/mlx.4
@@ -214,15 +214,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 the version 6.x firmware as found in the
 AcceleRAID 352 and eXtremeRAID 2000 and 3000 products.
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 38e43db048..21be264ccc 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 a45ce40bdf..791dd7b794 100644
--- a/share/man/man4/mn.4
+++ b/share/man/man4/mn.4
@@ -23,7 +23,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/mn.4,v 1.1 2005/05/10 16:48:03 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/mn.4,v 1.1 2006/04/17 21:32:57 swildner Exp $
 .\"
 .Dd May 10, 2005
 .Dt MN 4
@@ -53,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/moscom.4 b/share/man/man4/moscom.4
index 14b3f23759..17e5de26a0 100644
--- a/share/man/man4/moscom.4
+++ b/share/man/man4/moscom.4
@@ -1,5 +1,4 @@
 .\" $OpenBSD: moscom.4,v 1.2 2006/10/26 19:42:36 jmc Exp $
-.\" $DragonFly: src/share/man/man4/moscom.4,v 1.2 2007/11/12 19:04:00 swildner Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -63,5 +62,4 @@ and was imported into
 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/mouse.4 b/share/man/man4/mouse.4
index 4294e41655..3d2445db6b 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -393,4 +393,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/mps.4 b/share/man/man4/mps.4
index fd67bedda1..56b95743b8 100644
--- a/share/man/man4/mps.4
+++ b/share/man/man4/mps.4
@@ -153,9 +153,9 @@ 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 .
 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 is still in development, it has only been tested on the amd64
 architecture and has some known shortcomings:
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 077ec4280b..db3d32c876 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -188,9 +188,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/msk.4 b/share/man/man4/msk.4
index b8c7bcbad2..7e7582b6d5 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -240,8 +240,7 @@ This behavior can be turned off by setting this tunable to 0.
 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/mxge.4 b/share/man/man4/mxge.4
index 846d516bdc..d037b0ff92 100644
--- a/share/man/man4/mxge.4
+++ b/share/man/man4/mxge.4
@@ -173,4 +173,4 @@ It was first ported to
 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 cb0474f143..adf71cd670 100644
--- a/share/man/man4/my.4
+++ b/share/man/man4/my.4
@@ -23,7 +23,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/my.4,v 1.7 2005/10/07 02:32:15 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/my.4,v 1.3 2007/03/11 03:46:48 swildner Exp $
 .\"
 .Dd July 16, 2005
 .Dt MY 4
@@ -84,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/nata.4 b/share/man/man4/nata.4
index 09ba814f84..1f59339406 100644
--- a/share/man/man4/nata.4
+++ b/share/man/man4/nata.4
@@ -212,5 +212,4 @@ A later version was imported into
 as
 .Nm .
 .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/natapicam.4 b/share/man/man4/natapicam.4
index 099a0a9fd7..2d6229fea2 100644
--- a/share/man/man4/natapicam.4
+++ b/share/man/man4/natapicam.4
@@ -121,7 +121,7 @@ and
 .Fx 5.0 .
 .Sh AUTHORS
 The ATAPI/CAM driver was written by
-.An Thomas Quinot Aq thomas@FreeBSD.org .
+.An Thomas Quinot Aq Mt thomas@FreeBSD.org .
 .Sh BUGS
 .Nm
 and ATAPI-specific target drivers
diff --git a/share/man/man4/nataraid.4 b/share/man/man4/nataraid.4
index a6e2f60b15..917e4449ac 100644
--- a/share/man/man4/nataraid.4
+++ b/share/man/man4/nataraid.4
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.10 2006/09/18 15:24:18 ru Exp $
-.\" $DragonFly: src/share/man/man4/nataraid.4,v 1.2 2007/06/24 17:42:58 swildner Exp $
 .\"
 .Dd June 24, 2007
 .Dt NATARAID 4
@@ -145,6 +144,6 @@ Code exists, but it neither uses nor maintains parity information.
 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 Christian Brueffer Aq brueffer@FreeBSD.org .
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org .
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 6b7c6e7e09..3938988944 100644
--- a/share/man/man4/ncv.4
+++ b/share/man/man4/ncv.4
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ncv.4,v 1.7 2006/06/18 09:53:00 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/ncv.4,v 1.1 2008/07/27 18:42:15 thomas Exp $
 .\"
 .Dd August 10, 2004
 .Dt NCV 4
@@ -129,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 329b576894..84643a5d2f 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -157,4 +157,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 1fa567c02b..2f1fe71336 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -1038,6 +1038,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 dfbae8c7ba..b649253d58 100644
--- a/share/man/man4/nfe.4
+++ b/share/man/man4/nfe.4
@@ -1,5 +1,4 @@
 .\"	$OpenBSD: nfe.4,v 1.10 2006/08/30 22:56:05 jmc Exp $
-.\"	$DragonFly: src/share/man/man4/nfe.4,v 1.10 2008/07/26 07:41:45 sephe Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -124,15 +123,12 @@ and was imported into
 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 .
 It was ported to
 .Dx
 by
-.An Sepherosa Ziehau
-.Aq sepherosa@gmail.com .
+.An Sepherosa Ziehau Aq Mt sepherosa@gmail.com .
 .Sh CAVEATS
 NVIDIA refuse to release any documentation on their products.
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 1230a454d3..9541bf2981 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_UI.4,v 1.9.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_UI.4,v 1.4 2008/05/02 02:05:05 swildner Exp $
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -88,4 +87,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 cd9b33094c..3778cbfd8b 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_async.4,v 1.12.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_async.4,v 1.4 2008/05/02 02:05:05 swildner Exp $
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -166,4 +165,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_bpf.4 b/share/man/man4/ng_bpf.4
index 058cae4f23..c5cde7d013 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.17.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_bpf.4,v 1.6 2007/06/04 01:08:02 swildner Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd December 2, 1999
@@ -182,7 +181,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 038afc6ac7..bc917c9fbe 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.1.2.6 2001/12/17 11:30:12 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_bridge.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
 .\"
 .Dd August 31, 2000
 .Dt NG_BRIDGE 4
@@ -203,4 +202,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_cisco.4 b/share/man/man4/ng_cisco.4
index 80203bd99c..9ccd3afd78 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_cisco.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_cisco.4,v 1.5 2008/05/02 02:05:05 swildner Exp $
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -166,8 +165,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,
 the node does not support querying the remote end for its IP address
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index 2045719254..b49a227e8d 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_echo.4,v 1.10.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_echo.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -71,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 ab2c4453d8..e2b18b3976 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -25,7 +25,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.3.2.1 2002/04/09 20:17:17 julian Exp $
-.\" $DragonFly: src/share/man/man4/ng_etf.4,v 1.4 2007/06/04 00:40:31 swildner Exp $
 .\"
 .Dd February 28, 2001
 .Dt NG_ETF 4
@@ -152,4 +151,4 @@ The
 node type was implemented in
 .Fx 4.6 .
 .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 ac4da0e2d4..e0c2d94569 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_ether.4,v 1.4.2.12 2002/04/07 04:57:13 dd Exp $
-.\" $DragonFly: src/share/man/man4/ng_ether.4,v 1.5 2008/05/02 02:05:05 swildner Exp $
 .\"
 .Dd June 26, 2000
 .Dt NG_ETHER 4
@@ -205,8 +204,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_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 281c6b5e77..8b70b13675 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_frame_relay.4,v 1.11.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_frame_relay.4,v 1.5 2008/05/02 02:05:05 swildner Exp $
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -86,7 +85,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_hole.4 b/share/man/man4/ng_hole.4
index 2b4daf878c..35087663bb 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_hole.4,v 1.10.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_hole.4,v 1.3 2006/05/26 19:39:39 swildner Exp $
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -71,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_iface.4 b/share/man/man4/ng_iface.4
index f30adf6544..e242bf453f 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_iface.4,v 1.13.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_iface.4,v 1.4 2008/05/02 02:05:05 swildner Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -150,4 +149,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_ksocket.4 b/share/man/man4/ng_ksocket.4
index 589e6bae72..d892e9981a 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -33,7 +33,6 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/ng_ksocket.4,v 1.15.2.1 2001/12/21 09:00:51 ru Exp $
-.\" $DragonFly: src/share/man/man4/ng_ksocket.4,v 1.4 2007/05/13 20:29:48 hasso Exp $
 .\"
 .Dd November 15, 1999
 .Dt NG_KSOCKET 4
@@ -186,4 +185,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/syscons.4 b/share/man/man4/syscons.4
index 0034c1278d..4b405eaae3 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -25,7 +25,6 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/syscons.4,v 1.10.2.14 2003/04/25 21:21:36 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/syscons.4,v 1.8 2007/08/19 11:39:11 swildner Exp $
 .\"
 .Dd August 19, 2007
 .Dt SYSCONS 4
@@ -789,9 +788,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
 and
 .An Sascha Wildner .
 .Sh BUGS