Update @freebsd.org email addresses to @FreeBSD.org as is the

precedent.

44 files changed, 78 insertions, 78 deletions

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index cb248ea..6485c01 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -118,9 +118,9 @@ and is
 .Pp
 .Sh AUTHORS
 .An Mike Smith
-.Aq msmith@freebsd.org
+.Aq msmith@FreeBSD.org
 .An Scott Long
-.Aq scottl@freebsd.org
+.Aq scottl@FreeBSD.org
 .Sh BUGS
 This driver has not been tested on Alpha, though it should work.
 .Pp
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 8295658..2c6dd44 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 0ee27a2..30c17d2 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,6 +1,6 @@
 .\" $FreeBSD$
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index cc94de7..7bb31d1 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index c4bdd7e..01e53c3 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -166,5 +166,5 @@ local machine, the packet is lost.
 This should probably be
 a settable socket option in any case.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org ,
+.An Archie Cobbs Aq archie@FreeBSD.org ,
 Whistle Communications Corp.
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index a83cc59..f09ae9a 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -100,4 +100,4 @@ driver is loaded.
 .Xr ipx 3 ,
 .Xr ifconfig 8
 .Sh AUTHORS
-.An Boris Popov Aq bp@freebsd.org .
+.An Boris Popov Aq bp@FreeBSD.org .
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index d46a480..13b4306 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
@@ -53,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 archie@FreeBSD.org
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index e01cbf8..3ee75ae 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -189,4 +189,4 @@ by
 .Pp
 Several enhancements added by
 .An Archie Cobbs
-.Aq archie@freebsd.org .
+.Aq archie@FreeBSD.org .
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index a46da87..df267b5 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -30,8 +30,8 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Authors: Julian Elischer <julian@freebsd.org>
-.\"          Archie Cobbs <archie@freebsd.org>
+.\" Authors: Julian Elischer <julian@FreeBSD.org>
+.\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
@@ -1109,6 +1109,6 @@ customized for the Whistle InterJet.
 It first made its debut in the main tree in
 .Fx 3.4 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org ,
+.An Julian Elischer Aq julian@FreeBSD.org ,
 with contributions by
-.An Archie Cobbs Aq archie@freebsd.org .
+.An Archie Cobbs Aq archie@FreeBSD.org .
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 1f3e6a6..30b258b 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
@@ -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 julian@FreeBSD.org
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index 8b4d07d..70747f5e 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
@@ -166,4 +166,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index 966860f..5b58b0e 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
@@ -151,4 +151,4 @@ node type was implemented in
 .Xr bpf 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 41978b8..c630fbb 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
@@ -201,4 +201,4 @@ The
 node type was implemented in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 80a4d5a..66e7148 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
@@ -170,5 +170,5 @@ 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 julian@FreeBSD.org ,
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index 4b17f87..f20f88f 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
@@ -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 julian@FreeBSD.org
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 5a8ef15..9dfdba9 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 10bf333..ac6c936 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
@@ -95,4 +95,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 1a37b0e..d6901e4 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
@@ -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 julian@FreeBSD.org
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index 30c9459..35097bf 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
@@ -150,4 +150,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index a5375f6..17f7f02 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
@@ -184,4 +184,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index adbf96f..c7cbab3 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_lmi.8,v 1.4 1999/01/25 23:46:27 archie Exp $
@@ -132,4 +132,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index 0358847..0964260 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: ng_mppc.8,v 1.1 1999/12/08 20:20:39 archie Exp $
 .\" $FreeBSD$
@@ -189,4 +189,4 @@ However, Microsoft combined both compression and encryption into their
 .%O RFC 2637
 .Re
 .Sh AUTHORS
-Archie Cobbs <archie@freebsd.org>
+Archie Cobbs <archie@FreeBSD.org>
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 6033b49..8125e48 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
@@ -385,4 +385,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index e1f3d4c..331b993 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
@@ -401,4 +401,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 1eace57..00d03dc 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
@@ -156,4 +156,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index 285e982..d56682e 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_rfc1490.8,v 1.4 1999/01/25 23:46:27 archie Exp $
@@ -112,4 +112,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 5199d586..f16a677 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
@@ -175,4 +175,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index cd2ad1a..3bbeba7 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $
@@ -121,4 +121,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 1374028..ebcc836 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $
@@ -136,4 +136,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index 1a362bd..3e7a593 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\" 
-.\" Author: Archie Cobbs <archie@freebsd.org>
+.\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
@@ -220,4 +220,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@freebsd.org
+.An Archie Cobbs Aq archie@FreeBSD.org
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 519042c..da2f071 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 128960a..f5633e6 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -726,11 +726,11 @@ is FreeBSD specific with support for NetBSD and OpenBSD removed to
 ease further maintenance.
 .Sh AUTHORS
 Written by
-.An Hellmuth Michaelis Aq hm@freebsd.org
+.An Hellmuth Michaelis Aq hm@FreeBSD.org
 with much help from
 .An Brian Dunford-Shore Aq brian@morpheus.wustl.edu
 and
-.An Joerg Wunsch Aq joerg@freebsd.org
+.An Joerg Wunsch Aq joerg@FreeBSD.org
 .Pp
 This driver is based on several people's previous work, notably 
 the historic 
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 7dcd942..59f860c 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 9b7e72c..99aac28 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/sd.4 b/share/man/man4/sd.4
index cc5a075..ff7af7f 100644
--- a/share/man/man4/sd.4
+++ b/share/man/man4/sd.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index 8c28446..b518471 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2000
-.\"	Matthew Jacob <mjacob@freebsd.org>.  All rights reserved.
+.\"	Matthew Jacob <mjacob@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/st.4 b/share/man/man4/st.4
index 8441857..39f5242 100644
--- a/share/man/man4/st.4
+++ b/share/man/man4/st.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
+.\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index fadf9a9..815583b 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -110,9 +110,9 @@ The
 .Nm
 driver was written by
 .An Doug Ambrisko Aq ambrisko@whistle.com ,
-.An Julian Elischer Aq julian@freebsd.org
+.An Julian Elischer Aq julian@FreeBSD.org
 and
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 1ff7091..9c1dd69 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999
-.\"     Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"     Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 37faadc..d8680c2 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997, 1998
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -165,6 +165,6 @@ by
 .An Kazutaka YOKOTA Aq 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 n_hibma@FreeBSD.org
 with a large amount of input from
 .An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 23b98db..a94f7f6 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -106,7 +106,7 @@ The
 driver was written by
 .An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp
 and
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 397a20a..fc45bd6 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -119,6 +119,6 @@ by
 .An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@freebsd.org 
+.An Nick Hibma Aq n_hibma@FreeBSD.org 
 with input from
 .An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 53f3fff..fc50c36 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997, 1998
-.\"	Nick Hibma <n_hibma@freebsd.org>. All rights reserved.
+.\"	Nick Hibma <n_hibma@FreeBSD.org>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4
index ba9d617..cb73a2c 100644
--- a/share/man/man4/zero.4
+++ b/share/man/man4/zero.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Mike Pritchard <mpp@freebsd.org>.  All rights reserved.
+.\"	Mike Pritchard <mpp@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions