mdoc: consistently spell our email addresses <foo@FreeBSD.org>

Reviewed by:	ru

57 files changed, 64 insertions, 64 deletions

diff --git a/lib/libarchive/archive_read_disk.3 b/lib/libarchive/archive_read_disk.3
index fd53095..a009379 100644
--- a/lib/libarchive/archive_read_disk.3
+++ b/lib/libarchive/archive_read_disk.3
@@ -276,7 +276,7 @@ and first appeared in
 The
 .Nm libarchive
 library was written by
-.An Tim Kientzle Aq kientzle@freebsd.org .
+.An Tim Kientzle Aq kientzle@FreeBSD.org .
 .Sh BUGS
 The
 .Dq standard
diff --git a/lib/libc/gen/isgreater.3 b/lib/libc/gen/isgreater.3
index 0106155..9a6d85c 100644
--- a/lib/libc/gen/isgreater.3
+++ b/lib/libc/gen/isgreater.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
+.\" Copyright (c) 2003 David Schultz <das@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/gen/sem_timedwait.3 b/lib/libc/gen/sem_timedwait.3
index c2aca53..3a58d41 100644
--- a/lib/libc/gen/sem_timedwait.3
+++ b/lib/libc/gen/sem_timedwait.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008, David Xu <davidxu@freebsd.org> 
+.\" Copyright (c) 2008, David Xu <davidxu@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 73dc8c0..0fefddf 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1995 Peter Wemm <peter@freebsd.org>
+.\" Copyright (c) 1995 Peter Wemm <peter@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libc/gen/tcgetsid.3 b/lib/libc/gen/tcgetsid.3
index a270a0b..60bff8d 100644
--- a/lib/libc/gen/tcgetsid.3
+++ b/lib/libc/gen/tcgetsid.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008 David Xu <davidxu@freebsd.org>
+.\" Copyright (c) 2008 David Xu <davidxu@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 64378c2..73a1072 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1996 Jordan Hubbard (jkh@FreeBSD.org)
+.\" Copyright (c) 1996 Jordan Hubbard <jkh@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/lib/librpcsec_gss/rpc_gss_get_error.3 b/lib/librpcsec_gss/rpc_gss_get_error.3
index 74d2fa0..3b025d7 100644
--- a/lib/librpcsec_gss/rpc_gss_get_error.3
+++ b/lib/librpcsec_gss/rpc_gss_get_error.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_get_mech_info.3 b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
index 945b00b..d6abf4d 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mech_info.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
index e18a648..c37acea 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_get_principal_name.3 b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
index 19297f6..2eba5a9 100644
--- a/lib/librpcsec_gss/rpc_gss_get_principal_name.3
+++ b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_get_versions.3 b/lib/librpcsec_gss/rpc_gss_get_versions.3
index d72cbde..9192054 100644
--- a/lib/librpcsec_gss/rpc_gss_get_versions.3
+++ b/lib/librpcsec_gss/rpc_gss_get_versions.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_getcred.3 b/lib/librpcsec_gss/rpc_gss_getcred.3
index 844e61e..72a6384 100644
--- a/lib/librpcsec_gss/rpc_gss_getcred.3
+++ b/lib/librpcsec_gss/rpc_gss_getcred.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_is_installed.3 b/lib/librpcsec_gss/rpc_gss_is_installed.3
index a043c45..f0e03d8 100644
--- a/lib/librpcsec_gss/rpc_gss_is_installed.3
+++ b/lib/librpcsec_gss/rpc_gss_is_installed.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_max_data_length.3
index 0f80a3e..67029a0 100644
--- a/lib/librpcsec_gss/rpc_gss_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_max_data_length.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
index 95d0cd7..3449d0e 100644
--- a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
+++ b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
index c91a2f5..af2e7d0 100644
--- a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
+++ b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_qop_to_num.3 b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
index 38d2725..6f52b7b 100644
--- a/lib/librpcsec_gss/rpc_gss_qop_to_num.3
+++ b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_seccreate.3 b/lib/librpcsec_gss/rpc_gss_seccreate.3
index f78080d..579eac2 100644
--- a/lib/librpcsec_gss/rpc_gss_seccreate.3
+++ b/lib/librpcsec_gss/rpc_gss_seccreate.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_set_callback.3 b/lib/librpcsec_gss/rpc_gss_set_callback.3
index ae77cfc..eb90227 100644
--- a/lib/librpcsec_gss/rpc_gss_set_callback.3
+++ b/lib/librpcsec_gss/rpc_gss_set_callback.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_set_defaults.3 b/lib/librpcsec_gss/rpc_gss_set_defaults.3
index c4a24cf..e9b062d 100644
--- a/lib/librpcsec_gss/rpc_gss_set_defaults.3
+++ b/lib/librpcsec_gss/rpc_gss_set_defaults.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_set_svc_name.3 b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
index 96dc407..b63d38b 100644
--- a/lib/librpcsec_gss/rpc_gss_set_svc_name.3
+++ b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
index ef4871f..fdf24a6 100644
--- a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/lib/librpcsec_gss/rpcsec_gss.3 b/lib/librpcsec_gss/rpcsec_gss.3
index e688afb..9b86f3e 100644
--- a/lib/librpcsec_gss/rpcsec_gss.3
+++ b/lib/librpcsec_gss/rpcsec_gss.3
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 0cdcb20..81e3ea3 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -1,6 +1,6 @@
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
-.\" Copyright (c) 1999 Semen Ustimenko (semenu@FreeBSD.org)
+.\" Copyright (c) 1999 Semen Ustimenko <semenu@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4
index d12f460..d5683fb 100644
--- a/share/man/man4/ksyms.4
+++ b/share/man/man4/ksyms.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008-2009 Stacey Son <sson@freebsd.org> 
+.\" Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org>
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -135,7 +135,7 @@ The
 .Nm
 driver was written by
 .An Stacey Son
-.Aq sson@freebsd.org .
+.Aq sson@FreeBSD.org .
 .Sh BUGS
 Because files can be dynamically linked into the kernel at any time the symbol 
 information can vary.  When you open the
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index f0545f4..8a3c723 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
+.\" Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org>
 .\" All rights reserved.
 .\""
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4
index 3e12084..a9e57e3 100644
--- a/share/man/man4/man4.powerpc/bm.4
+++ b/share/man/man4/man4.powerpc/bm.4
@@ -83,7 +83,7 @@ The
 .Nm
 driver was written by
 .An Nathan Whitehorn
-.Aq nwhitehorn@freebsd.org
+.Aq nwhitehorn@FreeBSD.org
 based on work by
 .An Peter Grehan
-.Aq grehan@freebsd.org .
+.Aq grehan@FreeBSD.org .
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index fea4a34..3b93007b 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -1,6 +1,6 @@
 .\" ----------------------------------------------------------------------------
 .\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+.\" <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
 .\" can do whatever you want with this stuff. If we meet some day, and you think
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index 923b06d..3a9e121 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -6,7 +6,7 @@
 .\"	Hartmut Brandt.
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" 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/smp.4 b/share/man/man4/smp.4
index 2c06d1d..84c01bf 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997
-.\"	Steve Passe <fsmp@FreeBSD.ORG>.  All rights reserved.
+.\"	Steve Passe <fsmp@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/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4
index e813f6d..a363260 100644
--- a/share/man/man4/snd_emu10kx.4
+++ b/share/man/man4/snd_emu10kx.4
@@ -276,11 +276,11 @@ device driver first appeared in
 The PCM part of the driver is based on the
 .Xr snd_emu10k1 4
 SB Live!\& driver by
-.An "Cameron Grant" Aq cg@freebsd.org .
+.An Cameron Grant Aq cg@FreeBSD.org .
 The MIDI interface is based on the
 .Xr snd_emu10k1 4
 MIDI interface code by
-.An "Mathew Kanner" Aq matk@freebsd.org .
+.An Mathew Kanner Aq matk@FreeBSD.org .
 The
 .Nm
 device driver and this manual page were written by
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index da54d8c..f0cda0e 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998-2001 Semen Ustimenko (semenu@FreeBSD.org)
+.\" Copyright (c) 1998-2001 Semen Ustimenko <semenu@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4
index 47a34a1..cfae50b 100644
--- a/share/man/man4/u3g.4
+++ b/share/man/man4/u3g.4
@@ -121,5 +121,5 @@ The
 driver was written by
 .An Andrea Guzzo Aq aguzzo@anywi.com
 and
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
 Hardware for testing was provided by AnyWi Technologies, Leiden, NL.
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index 52a5fb6..4ef898e 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -177,9 +177,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong Aq weongyo@freebsd.org
+.An Weongyo Jeong Aq weongyo@FreeBSD.org
 and
-.An Sam Leffler Aq sam@freebsd.org .
+.An Sam Leffler Aq sam@FreeBSD.org .
 It is distantly related to a driver written by
 .An Damien Bergamini Aq damien@openbsd.org .
 .Sh CAVEATS
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 2ecfbce..05a4d02 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -176,4 +176,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man4/usb2_template.4 b/share/man/man4/usb2_template.4
index 06dc611..92abef3 100644
--- a/share/man/man4/usb2_template.4
+++ b/share/man/man4/usb2_template.4
@@ -81,4 +81,4 @@ module complies with the USB 2.0 standard.
 The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_seeothergids.9
index 87fd139..ea8f436 100644
--- a/share/man/man9/cr_seeothergids.9
+++ b/share/man/man9/cr_seeothergids.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_seeotheruids.9
index 2066c40..b7b7000 100644
--- a/share/man/man9/cr_seeotheruids.9
+++ b/share/man/man9/cr_seeotheruids.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index 6249a4d..722052a 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9
index fafe9d3..b94ec30 100644
--- a/share/man/man9/p_cansee.9
+++ b/share/man/man9/p_cansee.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\" Copyright (c) 2006 Ceri Davies <ceri@FreeBSD.org>
 .\"
 .\" All rights reserved.
diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9
index 68e90fb..4fe1f2f 100644
--- a/share/man/man9/prison_check.9
+++ b/share/man/man9/prison_check.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9
index a26e026..449058c 100644
--- a/share/man/man9/usbdi.9
+++ b/share/man/man9/usbdi.9
@@ -634,4 +634,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm usb
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 25634c9..170812b 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2004 Poul-Henning Kamp <phk@FreeBSD.org
+.\" Copyright (c) 2004 Poul-Henning Kamp <phk@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/ether_reflect/ether_reflect.1 b/tools/tools/ether_reflect/ether_reflect.1
index 704a4b0..c8388f0 100644
--- a/tools/tools/ether_reflect/ether_reflect.1
+++ b/tools/tools/ether_reflect/ether_reflect.1
@@ -105,4 +105,4 @@ This
 manual page was written by
 .An George V. Neville-Neil Aq gnn@FreeBSD.org .
 .Sh BUGS
-Should be reported to the author or to net@freebsd.org.
+Should be reported to the author or to net@FreeBSD.org.
diff --git a/usr.bin/csup/cpasswd.1 b/usr.bin/csup/cpasswd.1
index 1f486d1..e0b6e3f 100644
--- a/usr.bin/csup/cpasswd.1
+++ b/usr.bin/csup/cpasswd.1
@@ -50,7 +50,7 @@ and a server name.
 is the name the client uses to gain access to the
 server.  By convention, e-mail addresses are used for all client
 names, e.g.,
-.Ql BillyJoe@FreeBSD.ORG .
+.Ql BillyJoe@FreeBSD.org .
 Client names are case-insensitive.
 .Pp 
 .Ar ServerName
diff --git a/usr.bin/csup/csup.1 b/usr.bin/csup/csup.1
index 02e2edb..16a48df 100644
--- a/usr.bin/csup/csup.1
+++ b/usr.bin/csup/csup.1
@@ -845,7 +845,7 @@ case-insensitive.
 .Ar ClientName
 is the name the client uses to gain access to the server.  By
 convention, e-mail addresses are used for all client names, e.g.,
-.Ql BillyJoe@FreeBSD.ORG .
+.Ql BillyJoe@FreeBSD.org .
 Client names are case-insensitive.
 .Pp
 .Ar Password
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index 37d86ba..e6aeb4b 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -1,6 +1,6 @@
 .\" ----------------------------------------------------------------------------
 .\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <sobomax@FreeBSD.ORG> wrote this file. As long as you retain this notice you
+.\" <sobomax@FreeBSD.org> wrote this file. As long as you retain this notice you
 .\" can do whatever you want with this stuff. If we meet some day, and you think
 .\" this stuff is worth it, you can buy me a beer in return.       Maxim Sobolev
 .\" ----------------------------------------------------------------------------
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 05c247d..403d605 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
@@ -3,7 +3,7 @@
 .\" 	The FreeBSD Project.
 .\" 	All rights reserved.
 .\" 
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 8742e15..a7f99de 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
@@ -3,7 +3,7 @@
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" Redistribution of this software and documentation and use in source and
 .\" binary forms, with or without modification, are permitted provided that
@@ -433,4 +433,4 @@ This is the MIB that is implemented by this module.
 .Xr gensnmptree 1 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@freebsd.org
+.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/usr.sbin/clear_locks/clear_locks.8 b/usr.sbin/clear_locks/clear_locks.8
index 9f6cafe..6b601ea 100644
--- a/usr.sbin/clear_locks/clear_locks.8
+++ b/usr.sbin/clear_locks/clear_locks.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/gssd/gssd.8 b/usr.sbin/gssd/gssd.8
index c4704a1..02116e5 100644
--- a/usr.sbin/gssd/gssd.8
+++ b/usr.sbin/gssd/gssd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2008 Isilon Inc http://www.isilon.com/
 .\" Authors: Doug Rabson <dfr@rabson.org>
-.\" Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
+.\" Developed with Red Inc: Alfred Perlstein <alfred@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 8e49b07..d4b6452 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -27,7 +27,7 @@
 .\"
 .\" ----------------------------------------------------------------------------
 .\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+.\" <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
 .\" can do whatever you want with this stuff. If we meet some day, and you think
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 2117c7c..c7b58d5 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997
-.\"	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
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 445285b..56f901a 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1996
-.\"	Steve Passe <fsmp@FreeBSD.ORG>.  All rights reserved.
+.\"	Steve Passe <fsmp@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/usr.sbin/nscd/nscd.8 b/usr.sbin/nscd/nscd.8
index 1def32c..7e19af9 100644
--- a/usr.sbin/nscd/nscd.8
+++ b/usr.sbin/nscd/nscd.8
@@ -159,7 +159,7 @@ The default configuration file.
 .Xr nscd.conf 5 ,
 .Xr nsswitch.conf 5
 .Sh AUTHORS
-.An Michael Bushkov Aq bushman@freebsd.org
+.An Michael Bushkov Aq bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@freebsd.org .
+.Aq bushman@FreeBSD.org .
diff --git a/usr.sbin/nscd/nscd.conf.5 b/usr.sbin/nscd/nscd.conf.5
index 727e3e6..b5700a4 100644
--- a/usr.sbin/nscd/nscd.conf.5
+++ b/usr.sbin/nscd/nscd.conf.5
@@ -142,7 +142,7 @@ symbol at the beginning of the line for comments.
 .Xr nscd 8
 .Sh AUTHORS
 .An Michael Bushkov
-.Aq bushman@freebsd.org
+.Aq bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@freebsd.org .
+.Aq bushman@FreeBSD.org .
diff --git a/usr.sbin/snapinfo/snapinfo.8 b/usr.sbin/snapinfo/snapinfo.8
index 9d402ea..a7857fc 100644
--- a/usr.sbin/snapinfo/snapinfo.8
+++ b/usr.sbin/snapinfo/snapinfo.8
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2005 Mark Santcroos <marks@freebsd.org>
+.\" Copyright (c) 2005 Mark Santcroos <marks@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without