From 205578c96d0b4df03d02e4fa09ddb1d7667c0291 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Sun, 13 Jun 1999 16:12:34 +0000
Subject: [PATCH] perl -pi -e 's/freebsd.org/FreeBSD.org/i' authors.ent

To be consistent with edicts handed down from -core on -doc.
---
 en/handbook/authors.ent                     | 306 ++++++++++----------
 en_US.ISO8859-1/books/handbook/authors.ent  | 306 ++++++++++----------
 en_US.ISO8859-1/share/sgml/authors.ent      | 306 ++++++++++----------
 en_US.ISO_8859-1/books/handbook/authors.ent | 306 ++++++++++----------
 4 files changed, 612 insertions(+), 612 deletions(-)

diff --git a/en/handbook/authors.ent b/en/handbook/authors.ent
index 2b61c17ad7..28c5213dc4 100644
--- a/en/handbook/authors.ent
+++ b/en/handbook/authors.ent
@@ -1,348 +1,348 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
-     freefall.FreeBSD.ORG.
+     freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.21 1999-06-06 18:55:25 nik Exp $
+     $Id: authors.ent,v 1.22 1999-06-13 16:12:34 nik Exp $
 -->
 
-<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
+<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
-<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.ORG</email>">
+<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
-<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.ORG</email>">
+<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.org</email>">
 
-<!ENTITY a.alc "Alan L. Cox <email>alc@freebsd.org</email>">
+<!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
-<!ENTITY a.alex "Alex Nash <email>alex@freebsd.org</email>">
+<!ENTITY a.alex "Alex Nash <email>alex@FreeBSD.org</email>">
 
-<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.ORG</email>">
+<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
-<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.ORG</email>">
+<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
-<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.ORG</email>">
+<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
-<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.ORG</email>">
+<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
-<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.ORG</email>">
+<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
-<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.ORG</email>">
+<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
-<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.ORG</email>">
+<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
-<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.ORG</email>">
+<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
-<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.ORG</email>">
+<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
-<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.ORG</email>">
+<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
-<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.ORG</email>">
+<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chuck "Chuck Robey <email>chuckr@glue.umd.edu</email>">
 
-<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.ORG</email>">
+<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
-<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.ORG</email>">
+<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
-<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.ORG</email>">
+<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
-<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.ORG</email>">
+<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
-<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.ORG</email>">
+<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
-<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.ORG</email>">
+<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@blaze.net.au</email>">
 
-<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.ORG</email>">
+<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
-<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.ORG</email>">
+<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
-<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.ORG</email>">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
-<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.ORG</email>">
+<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
-<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.ORG</email>">
+<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
-<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.ORG</email>">
+<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
-<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.ORG</email>">
+<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
-<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.ORG</email>">
+<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.org</email>">
 
-<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.ORG</email>">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dirkvangulik  "Dirk-Willem van Gulik <email>Dirk.vanGulik@jrc.it</email>">
 
-<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.ORG</email>">
+<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
-<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.ORG</email>">
+<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
-<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.ORG</email>">
+<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
-<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.ORG</email>">
+<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
-<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.ORG</email>">
+<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
-<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.ORG</email>">
+<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
-<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.ORG</email>">
+<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
-<!ENTITY a.faq "FAQ Maintainer <email>faq@freebsd.org</email>">
+<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
 
-<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.ORG</email>">
+<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
-<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.ORG</email>">
+<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.ORG</email>">
+<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.ORG</email>">
+<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
-<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.ORG</email>">
+<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
-<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.ORG</email>">
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@cs.iastate.edu</email>">
 
-<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.ORG</email>">
+<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
-<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.ORG</email>">
+<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
-<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.ORG</email>">
+<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
-<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.ORG</email>">
+<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
-<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.ORG</email>">
+<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
-<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.ORG</email>">
+<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</email>">
 
-<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.ORG</email>">
+<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
-<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.ORG</email>">
+<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.handy "Brian N. Handy <email>handy@sxt4.physics.montana.edu</email>">
 
-<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.ORG</email>">
+<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
-<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.ORG</email>">
+<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
-<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.ORG</email>">
+<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
-<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.ORG</email>">
+<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
-<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.ORG</email>">
+<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.ORG</email>">
+<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
-<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.ORG</email>">
+<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jb  "John Birrell <email>jb@cimlogic.com.au</email>">
 
-<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.ORG</email>">
+<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
 
-<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.ORG</email>">
+<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
-<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.ORG</email>">
+<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
-<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.ORG</email>">
+<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
-<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.ORG</email>">
+<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
-<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.ORG</email>">
+<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
-<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.ORG</email>">
+<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
-<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.ORG</email>">
+<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
-<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.ORG</email>">
+<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlind "John Lind <email>john@starfire.MN.ORG</email>">
 
-<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.ORG</email>">
+<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
-<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.ORG</email>">
+<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
-<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.ORG</email>">
+<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
-<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.ORG</email>">
+<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
-<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.ORG</email>">
+<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
-<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.ORG</email>">
+<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
-<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.ORG</email>">
+<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
-<!ENTITY a.jraynard "James Raynard <email>jraynard@freebsd.org</email>">
+<!ENTITY a.jraynard "James Raynard <email>jraynard@FreeBSD.org</email>">
 
-<!ENTITY a.jseger "Justin Seger <email>jseger@freebsd.org</email>">
+<!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
-<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.ORG</email>">
+<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.org</email>">
 
-<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.ORG</email>">
+<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
-<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.ORG</email>">
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
 
-<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.ORG</email>">
+<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
 
-<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.ORG</email>">
+<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
-<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.ORG</email>">
+<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
-<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.ORG</email>">
+<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
-<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.ORG</email>">
+<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
-<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.ORG</email>">
+<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
-<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.ORG</email>">
+<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.ORG</email>">
+<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.ORG</email>">
+<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.org</email>">
 
-<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.ORG</email>">
+<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.org</email>">
 
-<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.ORG</email>">
+<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.mayo "Mark Mayo <email>mark@vmunix.com</email>">
 
-<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.ORG</email>">
+<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
-<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.ORG</email>">
+<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
-<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.ORG</email>">
+<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.md "Mark Dapoz <email>md@bsc.no</email>">
 
-<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.ORG</email>">
+<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.org</email>">
 
-<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.ORG</email>">
+<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
-<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.ORG</email>">
+<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
-<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.ORG</email>">
+<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
-<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.ORG</email>">
+<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
-<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.ORG</email>">
+<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
-<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.ORG</email>">
+<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.org</email>">
 
-<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.ORG</email>">
+<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
-<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.ORG</email>">
+<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
-<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.ORG</email>">
+<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
-<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.ORG</email>">
+<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
-<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.ORG</email>">
+<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
-<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.ORG</email>">
+<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
 
-<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.ORG</email>">
+<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
-<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.ORG</email>">
+<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
-<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.ORG</email>">
+<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@fasterix.freenix.org</email>">
 
-<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.ORG</email>">
+<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
-<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.ORG</email>">
+<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
-<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.ORG</email>">
+<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pjc "Peter Childs <email>pjchilds@imforei.apana.org.au</email>">
 
-<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.ORG</email>">
+<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
-<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.ORG</email>">
+<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
-<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.ORG</email>">
+<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.rhuff "Robert Huff <email>rhuff@cybercom.net</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@ag.com.br</email>">
 
-<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.ORG</email>">
+<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.org</email>">
 
-<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.ORG</email>">
+<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
-<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.ORG</email>">
+<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
-<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.ORG</email>">
+<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
-<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.ORG</email>">
+<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
-<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.ORG</email>">
+<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.org</email>">
 
-<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.ORG</email>">
+<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
-<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.ORG</email>">
+<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.org</email>">
 
-<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.ORG</email>">
+<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
-<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.ORG</email>">
+<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
-<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.ORG</email>">
+<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
-<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.ORG</email>">
+<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.org</email>">
 
-<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.ORG</email>">
+<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
-<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.ORG</email>">
+<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
-<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.ORG</email>">
+<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
-<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.ORG</email>">
+<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
-<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.ORG</email>">
+<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
-<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
+<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
-<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
-<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
-<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
+<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
-<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.ORG</email>">
+<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
-<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.ORG</email>">
+<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
-<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.ORG</email>">
+<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
-<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.ORG</email>">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
-<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.ORG</email>">
+<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
-<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.ORG</email>">
+<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
-<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.ORG</email>">
+<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
-<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.ORG</email>">
+<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
-<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.ORG</email>">
+<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
@@ -350,10 +350,10 @@
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
 
-<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.ORG</email>">
+<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
-<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.ORG</email>">
+<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
-<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.ORG</email>">
+<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
-<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.ORG</email>">
+<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">
diff --git a/en_US.ISO8859-1/books/handbook/authors.ent b/en_US.ISO8859-1/books/handbook/authors.ent
index 2b61c17ad7..28c5213dc4 100644
--- a/en_US.ISO8859-1/books/handbook/authors.ent
+++ b/en_US.ISO8859-1/books/handbook/authors.ent
@@ -1,348 +1,348 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
-     freefall.FreeBSD.ORG.
+     freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.21 1999-06-06 18:55:25 nik Exp $
+     $Id: authors.ent,v 1.22 1999-06-13 16:12:34 nik Exp $
 -->
 
-<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
+<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
-<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.ORG</email>">
+<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
-<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.ORG</email>">
+<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.org</email>">
 
-<!ENTITY a.alc "Alan L. Cox <email>alc@freebsd.org</email>">
+<!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
-<!ENTITY a.alex "Alex Nash <email>alex@freebsd.org</email>">
+<!ENTITY a.alex "Alex Nash <email>alex@FreeBSD.org</email>">
 
-<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.ORG</email>">
+<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
-<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.ORG</email>">
+<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
-<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.ORG</email>">
+<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
-<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.ORG</email>">
+<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
-<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.ORG</email>">
+<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
-<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.ORG</email>">
+<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
-<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.ORG</email>">
+<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
-<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.ORG</email>">
+<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
-<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.ORG</email>">
+<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
-<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.ORG</email>">
+<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
-<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.ORG</email>">
+<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chuck "Chuck Robey <email>chuckr@glue.umd.edu</email>">
 
-<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.ORG</email>">
+<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
-<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.ORG</email>">
+<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
-<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.ORG</email>">
+<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
-<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.ORG</email>">
+<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
-<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.ORG</email>">
+<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
-<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.ORG</email>">
+<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@blaze.net.au</email>">
 
-<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.ORG</email>">
+<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
-<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.ORG</email>">
+<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
-<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.ORG</email>">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
-<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.ORG</email>">
+<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
-<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.ORG</email>">
+<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
-<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.ORG</email>">
+<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
-<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.ORG</email>">
+<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
-<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.ORG</email>">
+<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.org</email>">
 
-<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.ORG</email>">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dirkvangulik  "Dirk-Willem van Gulik <email>Dirk.vanGulik@jrc.it</email>">
 
-<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.ORG</email>">
+<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
-<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.ORG</email>">
+<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
-<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.ORG</email>">
+<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
-<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.ORG</email>">
+<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
-<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.ORG</email>">
+<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
-<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.ORG</email>">
+<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
-<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.ORG</email>">
+<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
-<!ENTITY a.faq "FAQ Maintainer <email>faq@freebsd.org</email>">
+<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
 
-<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.ORG</email>">
+<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
-<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.ORG</email>">
+<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.ORG</email>">
+<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.ORG</email>">
+<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
-<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.ORG</email>">
+<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
-<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.ORG</email>">
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@cs.iastate.edu</email>">
 
-<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.ORG</email>">
+<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
-<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.ORG</email>">
+<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
-<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.ORG</email>">
+<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
-<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.ORG</email>">
+<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
-<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.ORG</email>">
+<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
-<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.ORG</email>">
+<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</email>">
 
-<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.ORG</email>">
+<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
-<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.ORG</email>">
+<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.handy "Brian N. Handy <email>handy@sxt4.physics.montana.edu</email>">
 
-<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.ORG</email>">
+<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
-<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.ORG</email>">
+<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
-<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.ORG</email>">
+<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
-<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.ORG</email>">
+<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
-<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.ORG</email>">
+<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.ORG</email>">
+<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
-<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.ORG</email>">
+<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jb  "John Birrell <email>jb@cimlogic.com.au</email>">
 
-<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.ORG</email>">
+<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
 
-<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.ORG</email>">
+<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
-<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.ORG</email>">
+<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
-<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.ORG</email>">
+<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
-<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.ORG</email>">
+<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
-<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.ORG</email>">
+<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
-<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.ORG</email>">
+<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
-<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.ORG</email>">
+<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
-<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.ORG</email>">
+<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlind "John Lind <email>john@starfire.MN.ORG</email>">
 
-<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.ORG</email>">
+<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
-<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.ORG</email>">
+<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
-<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.ORG</email>">
+<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
-<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.ORG</email>">
+<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
-<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.ORG</email>">
+<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
-<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.ORG</email>">
+<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
-<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.ORG</email>">
+<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
-<!ENTITY a.jraynard "James Raynard <email>jraynard@freebsd.org</email>">
+<!ENTITY a.jraynard "James Raynard <email>jraynard@FreeBSD.org</email>">
 
-<!ENTITY a.jseger "Justin Seger <email>jseger@freebsd.org</email>">
+<!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
-<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.ORG</email>">
+<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.org</email>">
 
-<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.ORG</email>">
+<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
-<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.ORG</email>">
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
 
-<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.ORG</email>">
+<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
 
-<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.ORG</email>">
+<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
-<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.ORG</email>">
+<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
-<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.ORG</email>">
+<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
-<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.ORG</email>">
+<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
-<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.ORG</email>">
+<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
-<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.ORG</email>">
+<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.ORG</email>">
+<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.ORG</email>">
+<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.org</email>">
 
-<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.ORG</email>">
+<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.org</email>">
 
-<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.ORG</email>">
+<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.mayo "Mark Mayo <email>mark@vmunix.com</email>">
 
-<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.ORG</email>">
+<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
-<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.ORG</email>">
+<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
-<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.ORG</email>">
+<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.md "Mark Dapoz <email>md@bsc.no</email>">
 
-<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.ORG</email>">
+<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.org</email>">
 
-<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.ORG</email>">
+<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
-<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.ORG</email>">
+<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
-<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.ORG</email>">
+<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
-<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.ORG</email>">
+<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
-<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.ORG</email>">
+<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
-<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.ORG</email>">
+<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.org</email>">
 
-<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.ORG</email>">
+<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
-<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.ORG</email>">
+<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
-<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.ORG</email>">
+<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
-<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.ORG</email>">
+<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
-<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.ORG</email>">
+<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
-<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.ORG</email>">
+<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
 
-<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.ORG</email>">
+<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
-<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.ORG</email>">
+<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
-<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.ORG</email>">
+<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@fasterix.freenix.org</email>">
 
-<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.ORG</email>">
+<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
-<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.ORG</email>">
+<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
-<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.ORG</email>">
+<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pjc "Peter Childs <email>pjchilds@imforei.apana.org.au</email>">
 
-<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.ORG</email>">
+<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
-<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.ORG</email>">
+<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
-<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.ORG</email>">
+<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.rhuff "Robert Huff <email>rhuff@cybercom.net</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@ag.com.br</email>">
 
-<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.ORG</email>">
+<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.org</email>">
 
-<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.ORG</email>">
+<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
-<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.ORG</email>">
+<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
-<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.ORG</email>">
+<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
-<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.ORG</email>">
+<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
-<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.ORG</email>">
+<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.org</email>">
 
-<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.ORG</email>">
+<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
-<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.ORG</email>">
+<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.org</email>">
 
-<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.ORG</email>">
+<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
-<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.ORG</email>">
+<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
-<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.ORG</email>">
+<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
-<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.ORG</email>">
+<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.org</email>">
 
-<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.ORG</email>">
+<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
-<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.ORG</email>">
+<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
-<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.ORG</email>">
+<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
-<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.ORG</email>">
+<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
-<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.ORG</email>">
+<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
-<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
+<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
-<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
-<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
-<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
+<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
-<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.ORG</email>">
+<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
-<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.ORG</email>">
+<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
-<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.ORG</email>">
+<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
-<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.ORG</email>">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
-<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.ORG</email>">
+<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
-<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.ORG</email>">
+<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
-<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.ORG</email>">
+<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
-<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.ORG</email>">
+<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
-<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.ORG</email>">
+<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
@@ -350,10 +350,10 @@
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
 
-<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.ORG</email>">
+<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
-<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.ORG</email>">
+<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
-<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.ORG</email>">
+<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
-<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.ORG</email>">
+<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index 2b61c17ad7..28c5213dc4 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1,348 +1,348 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
-     freefall.FreeBSD.ORG.
+     freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.21 1999-06-06 18:55:25 nik Exp $
+     $Id: authors.ent,v 1.22 1999-06-13 16:12:34 nik Exp $
 -->
 
-<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
+<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
-<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.ORG</email>">
+<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
-<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.ORG</email>">
+<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.org</email>">
 
-<!ENTITY a.alc "Alan L. Cox <email>alc@freebsd.org</email>">
+<!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
-<!ENTITY a.alex "Alex Nash <email>alex@freebsd.org</email>">
+<!ENTITY a.alex "Alex Nash <email>alex@FreeBSD.org</email>">
 
-<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.ORG</email>">
+<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
-<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.ORG</email>">
+<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
-<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.ORG</email>">
+<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
-<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.ORG</email>">
+<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
-<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.ORG</email>">
+<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
-<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.ORG</email>">
+<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
-<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.ORG</email>">
+<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
-<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.ORG</email>">
+<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
-<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.ORG</email>">
+<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
-<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.ORG</email>">
+<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
-<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.ORG</email>">
+<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chuck "Chuck Robey <email>chuckr@glue.umd.edu</email>">
 
-<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.ORG</email>">
+<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
-<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.ORG</email>">
+<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
-<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.ORG</email>">
+<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
-<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.ORG</email>">
+<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
-<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.ORG</email>">
+<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
-<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.ORG</email>">
+<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@blaze.net.au</email>">
 
-<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.ORG</email>">
+<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
-<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.ORG</email>">
+<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
-<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.ORG</email>">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
-<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.ORG</email>">
+<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
-<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.ORG</email>">
+<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
-<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.ORG</email>">
+<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
-<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.ORG</email>">
+<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
-<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.ORG</email>">
+<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.org</email>">
 
-<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.ORG</email>">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dirkvangulik  "Dirk-Willem van Gulik <email>Dirk.vanGulik@jrc.it</email>">
 
-<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.ORG</email>">
+<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
-<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.ORG</email>">
+<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
-<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.ORG</email>">
+<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
-<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.ORG</email>">
+<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
-<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.ORG</email>">
+<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
-<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.ORG</email>">
+<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
-<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.ORG</email>">
+<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
-<!ENTITY a.faq "FAQ Maintainer <email>faq@freebsd.org</email>">
+<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
 
-<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.ORG</email>">
+<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
-<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.ORG</email>">
+<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.ORG</email>">
+<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.ORG</email>">
+<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
-<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.ORG</email>">
+<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
-<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.ORG</email>">
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@cs.iastate.edu</email>">
 
-<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.ORG</email>">
+<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
-<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.ORG</email>">
+<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
-<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.ORG</email>">
+<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
-<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.ORG</email>">
+<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
-<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.ORG</email>">
+<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
-<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.ORG</email>">
+<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</email>">
 
-<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.ORG</email>">
+<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
-<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.ORG</email>">
+<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.handy "Brian N. Handy <email>handy@sxt4.physics.montana.edu</email>">
 
-<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.ORG</email>">
+<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
-<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.ORG</email>">
+<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
-<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.ORG</email>">
+<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
-<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.ORG</email>">
+<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
-<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.ORG</email>">
+<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.ORG</email>">
+<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
-<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.ORG</email>">
+<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jb  "John Birrell <email>jb@cimlogic.com.au</email>">
 
-<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.ORG</email>">
+<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
 
-<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.ORG</email>">
+<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
-<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.ORG</email>">
+<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
-<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.ORG</email>">
+<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
-<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.ORG</email>">
+<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
-<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.ORG</email>">
+<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
-<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.ORG</email>">
+<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
-<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.ORG</email>">
+<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
-<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.ORG</email>">
+<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlind "John Lind <email>john@starfire.MN.ORG</email>">
 
-<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.ORG</email>">
+<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
-<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.ORG</email>">
+<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
-<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.ORG</email>">
+<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
-<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.ORG</email>">
+<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
-<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.ORG</email>">
+<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
-<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.ORG</email>">
+<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
-<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.ORG</email>">
+<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
-<!ENTITY a.jraynard "James Raynard <email>jraynard@freebsd.org</email>">
+<!ENTITY a.jraynard "James Raynard <email>jraynard@FreeBSD.org</email>">
 
-<!ENTITY a.jseger "Justin Seger <email>jseger@freebsd.org</email>">
+<!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
-<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.ORG</email>">
+<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.org</email>">
 
-<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.ORG</email>">
+<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
-<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.ORG</email>">
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
 
-<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.ORG</email>">
+<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
 
-<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.ORG</email>">
+<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
-<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.ORG</email>">
+<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
-<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.ORG</email>">
+<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
-<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.ORG</email>">
+<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
-<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.ORG</email>">
+<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
-<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.ORG</email>">
+<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.ORG</email>">
+<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.ORG</email>">
+<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.org</email>">
 
-<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.ORG</email>">
+<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.org</email>">
 
-<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.ORG</email>">
+<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.mayo "Mark Mayo <email>mark@vmunix.com</email>">
 
-<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.ORG</email>">
+<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
-<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.ORG</email>">
+<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
-<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.ORG</email>">
+<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.md "Mark Dapoz <email>md@bsc.no</email>">
 
-<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.ORG</email>">
+<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.org</email>">
 
-<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.ORG</email>">
+<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
-<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.ORG</email>">
+<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
-<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.ORG</email>">
+<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
-<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.ORG</email>">
+<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
-<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.ORG</email>">
+<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
-<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.ORG</email>">
+<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.org</email>">
 
-<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.ORG</email>">
+<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
-<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.ORG</email>">
+<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
-<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.ORG</email>">
+<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
-<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.ORG</email>">
+<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
-<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.ORG</email>">
+<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
-<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.ORG</email>">
+<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
 
-<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.ORG</email>">
+<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
-<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.ORG</email>">
+<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
-<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.ORG</email>">
+<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@fasterix.freenix.org</email>">
 
-<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.ORG</email>">
+<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
-<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.ORG</email>">
+<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
-<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.ORG</email>">
+<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pjc "Peter Childs <email>pjchilds@imforei.apana.org.au</email>">
 
-<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.ORG</email>">
+<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
-<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.ORG</email>">
+<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
-<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.ORG</email>">
+<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.rhuff "Robert Huff <email>rhuff@cybercom.net</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@ag.com.br</email>">
 
-<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.ORG</email>">
+<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.org</email>">
 
-<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.ORG</email>">
+<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
-<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.ORG</email>">
+<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
-<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.ORG</email>">
+<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
-<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.ORG</email>">
+<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
-<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.ORG</email>">
+<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.org</email>">
 
-<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.ORG</email>">
+<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
-<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.ORG</email>">
+<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.org</email>">
 
-<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.ORG</email>">
+<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
-<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.ORG</email>">
+<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
-<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.ORG</email>">
+<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
-<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.ORG</email>">
+<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.org</email>">
 
-<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.ORG</email>">
+<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
-<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.ORG</email>">
+<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
-<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.ORG</email>">
+<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
-<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.ORG</email>">
+<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
-<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.ORG</email>">
+<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
-<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
+<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
-<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
-<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
-<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
+<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
-<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.ORG</email>">
+<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
-<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.ORG</email>">
+<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
-<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.ORG</email>">
+<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
-<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.ORG</email>">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
-<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.ORG</email>">
+<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
-<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.ORG</email>">
+<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
-<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.ORG</email>">
+<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
-<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.ORG</email>">
+<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
-<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.ORG</email>">
+<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
@@ -350,10 +350,10 @@
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
 
-<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.ORG</email>">
+<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
-<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.ORG</email>">
+<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
-<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.ORG</email>">
+<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
-<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.ORG</email>">
+<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">
diff --git a/en_US.ISO_8859-1/books/handbook/authors.ent b/en_US.ISO_8859-1/books/handbook/authors.ent
index 2b61c17ad7..28c5213dc4 100644
--- a/en_US.ISO_8859-1/books/handbook/authors.ent
+++ b/en_US.ISO_8859-1/books/handbook/authors.ent
@@ -1,348 +1,348 @@
 <!--
      Names and email address of contributing authors and CVS committers.
      Entity names for committers should be the same as their login names on
-     freefall.FreeBSD.ORG.
+     freefall.FreeBSD.org.
 
      Use these entities when referencing people.
 
      Please keep this list in alphabetical order by entity names.
 
-     $Id: authors.ent,v 1.21 1999-06-06 18:55:25 nik Exp $
+     $Id: authors.ent,v 1.22 1999-06-13 16:12:34 nik Exp $
 -->
 
-<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.ORG</email>">
+<!ENTITY a.abial "Andrzej Bialecki <email>abial@FreeBSD.org</email>">
 
-<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.ORG</email>">
+<!ENTITY a.ache "Andrey A. Chernov <email>ache@FreeBSD.org</email>">
 
-<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.ORG</email>">
+<!ENTITY a.adam  "Adam David <email>adam@FreeBSD.org</email>">
 
-<!ENTITY a.alc "Alan L. Cox <email>alc@freebsd.org</email>">
+<!ENTITY a.alc "Alan L. Cox <email>alc@FreeBSD.org</email>">
 
-<!ENTITY a.alex "Alex Nash <email>alex@freebsd.org</email>">
+<!ENTITY a.alex "Alex Nash <email>alex@FreeBSD.org</email>">
 
-<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.ORG</email>">
+<!ENTITY a.amurai  "Atsushi Murai <email>amurai@FreeBSD.org</email>">
 
-<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.ORG</email>">
+<!ENTITY a.andreas "Andreas Klemm <email>andreas@FreeBSD.org</email>">
 
-<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.ORG</email>">
+<!ENTITY a.archie "Archie Cobbs <email>archie@FreeBSD.org</email>">
 
-<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.ORG</email>">
+<!ENTITY a.asami "Satoshi Asami <email>asami@FreeBSD.org</email>">
 
-<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.ORG</email>">
+<!ENTITY a.ats  "Andreas Schulz <email>ats@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster <email>awebster@pubnix.net</email>">
 
-<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.ORG</email>">
+<!ENTITY a.bde  "Bruce Evans <email>bde@FreeBSD.org</email>">
 
-<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.ORG</email>">
+<!ENTITY a.billf "Bill Fumerola <email>billf@FreeBSD.org</email>">
 
-<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.ORG</email>">
+<!ENTITY a.brandon  "Brandon Gillespie <email>brandon@FreeBSD.org</email>">
 
-<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.ORG</email>">
+<!ENTITY a.brian "Brian Somers <email>brian@FreeBSD.org</email>">
 
-<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.ORG</email>">
+<!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>">
 
-<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.ORG</email>">
+<!ENTITY a.charnier "Philippe Charnier <email>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chuck "Chuck Robey <email>chuckr@glue.umd.edu</email>">
 
-<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.ORG</email>">
+<!ENTITY a.chuckr "Chuck Robey <email>chuckr@FreeBSD.org</email>">
 
-<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.ORG</email>">
+<!ENTITY a.cracauer "Martin Cracauer <email>cracauer@FreeBSD.org</email>">
 
-<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.ORG</email>">
+<!ENTITY a.csgr  "Geoff Rehmet <email>csgr@FreeBSD.org</email>">
 
-<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.ORG</email>">
+<!ENTITY a.cwt  "Chris Timmons <email>cwt@FreeBSD.org</email>">
 
-<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.ORG</email>">
+<!ENTITY a.danny  "Daniel O'Callaghan <email>danny@FreeBSD.org</email>">
 
-<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.ORG</email>">
+<!ENTITY a.darrenr "Darren Reed <email>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent <email>davidn@blaze.net.au</email>">
 
-<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.ORG</email>">
+<!ENTITY a.dburr "Donald Burr <email>dburr@FreeBSD.org</email>">
 
-<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.ORG</email>">
+<!ENTITY a.dcs "Daniel C. Sobral <email>dcs@FreeBSD.org</email>">
 
-<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.ORG</email>">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav <email>des@FreeBSD.org</email>">
 
-<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.ORG</email>">
+<!ENTITY a.dfr  "Doug Rabson <email>dfr@FreeBSD.org</email>">
 
-<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.ORG</email>">
+<!ENTITY a.dg "David Greenman <email>dg@FreeBSD.org</email>">
 
-<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.ORG</email>">
+<!ENTITY a.dick "Richard Seaman Jr. <email>dick@FreeBSD.org</email>">
 
-<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.ORG</email>">
+<!ENTITY a.dillon "Matthew Dillon <email>dillon@FreeBSD.org</email>">
 
-<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.ORG</email>">
+<!ENTITY a.dima  "Dima Ruban <email>dima@FreeBSD.org</email>">
 
-<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.ORG</email>">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg <email>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dirkvangulik  "Dirk-Willem van Gulik <email>Dirk.vanGulik@jrc.it</email>">
 
-<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.ORG</email>">
+<!ENTITY a.dt "Dmitrij Tejblum <email>dt@FreeBSD.org</email>">
 
-<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.ORG</email>">
+<!ENTITY a.dwhite "Doug White <email>dwhite@FreeBSD.org</email>">
 
-<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.ORG</email>">
+<!ENTITY a.dufault "Peter Dufault <email>dufault@FreeBSD.org</email>">
 
-<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.ORG</email>">
+<!ENTITY a.dyson "John Dyson <email>dyson@FreeBSD.org</email>">
 
-<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.ORG</email>">
+<!ENTITY a.eivind  "Eivind Eklund <email>eivind@FreeBSD.org</email>">
 
-<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.ORG</email>">
+<!ENTITY a.ejc "Eric J. Chet <email>ejc@FreeBSD.org</email>">
 
-<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.ORG</email>">
+<!ENTITY a.erich  "Eric L. Hernes <email>erich@FreeBSD.org</email>">
 
-<!ENTITY a.faq "FAQ Maintainer <email>faq@freebsd.org</email>">
+<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
 
-<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.ORG</email>">
+<!ENTITY a.fenner  "Bill Fenner <email>fenner@FreeBSD.org</email>">
 
-<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.ORG</email>">
+<!ENTITY a.flathill "Seiichirou Hiraoka <email>flathill@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.ORG</email>">
+<!ENTITY a.foxfair "Howard F. Hu <email>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.ORG</email>">
+<!ENTITY a.fsmp "Steve Passe <email>fsmp@FreeBSD.org</email>">
 
-<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.ORG</email>">
+<!ENTITY a.gallatin "Andrew Gallatin <email>gallatin@FreeBSD.org</email>">
 
-<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.ORG</email>">
+<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gena "Gennady B. Sorokopud <email>gena@NetVision.net.il</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer <email>ghelmer@cs.iastate.edu</email>">
 
-<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.ORG</email>">
+<!ENTITY a.gibbs "Justin T. Gibbs <email>gibbs@FreeBSD.org</email>">
 
-<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.ORG</email>">
+<!ENTITY a.mjacob "Matthew Jacob <email>mjacob@FreeBSD.org</email>">
 
-<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.ORG</email>">
+<!ENTITY a.gj  "Gary Jennejohn <email>gj@FreeBSD.org</email>">
 
-<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.ORG</email>">
+<!ENTITY a.gpalmer "Gary Palmer <email>gpalmer@FreeBSD.org</email>">
 
-<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.ORG</email>">
+<!ENTITY a.graichen  "Thomas Graichen <email>graichen@FreeBSD.org</email>">
 
-<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.ORG</email>">
+<!ENTITY a.grog "Greg Lehey <email>grog@FreeBSD.org</email>">
 
 <!ENTITY a.gryphon "Coranth Gryphon <email>gryphon@healer.com</email>">
 
-<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.ORG</email>">
+<!ENTITY a.guido  "Guido van Rooij <email>guido@FreeBSD.org</email>">
 
-<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.ORG</email>">
+<!ENTITY a.hanai "Hiroyuki HANAI <email>hanai@FreeBSD.org</email>">
 
 <!ENTITY a.handy "Brian N. Handy <email>handy@sxt4.physics.montana.edu</email>">
 
-<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.ORG</email>">
+<!ENTITY a.helbig "Wolfgang Helbig <email>helbig@FreeBSD.org</email>">
 
-<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.ORG</email>">
+<!ENTITY a.hm "Hellmuth Michaelis <email>hm@FreeBSD.org</email>">
 
-<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.ORG</email>">
+<!ENTITY a.hoek "Tim Vanderhoek <email>hoek@FreeBSD.org</email>">
 
-<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.ORG</email>">
+<!ENTITY a.hosokawa  "Tatsumi Hosokawa <email>hosokawa@FreeBSD.org</email>">
 
-<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.ORG</email>">
+<!ENTITY a.hsu  "Jeffrey Hsu <email>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.ORG</email>">
+<!ENTITY a.imp "Warner Losh <email>imp@FreeBSD.org</email>">
 
 <!ENTITY a.itojun "Jun-ichiro Itoh <email>itojun@itojun.org</email>">
 
-<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.ORG</email>">
+<!ENTITY a.jasone "Jason Evans <email>jasone@FreeBSD.org</email>">
 
 <!ENTITY a.jb  "John Birrell <email>jb@cimlogic.com.au</email>">
 
-<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.ORG</email>">
+<!ENTITY a.jdp  "John Polstra <email>jdp@FreeBSD.org</email>">
 
 <!ENTITY a.jehamby "Jake Hamby <email>jehamby@lightside.com</email>">
 
-<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.ORG</email>">
+<!ENTITY a.jfieber "John Fieber <email>jfieber@FreeBSD.org</email>">
 
-<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.ORG</email>">
+<!ENTITY a.jfitz "James FitzGibbon <email>jfitz@FreeBSD.org</email>">
 
-<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.ORG</email>">
+<!ENTITY a.jgreco "Joe Greco <email>jgreco@FreeBSD.org</email>">
 
-<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.ORG</email>">
+<!ENTITY a.jhay "John Hay <email>jhay@FreeBSD.org</email>">
 
-<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.ORG</email>">
+<!ENTITY a.jhs "Julian Stacey <email>jhs@FreeBSD.org</email>">
 
-<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.ORG</email>">
+<!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
-<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.ORG</email>">
+<!ENTITY a.jkoshy "Joseph Koshy <email>jkoshy@FreeBSD.org</email>">
 
-<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.ORG</email>">
+<!ENTITY a.jlemon  "Jonathan Lemon <email>jlemon@FreeBSD.org</email>">
 
 <!ENTITY a.jlind "John Lind <email>john@starfire.MN.ORG</email>">
 
-<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.ORG</email>">
+<!ENTITY a.jlrobin  "James L. Robinson <email>jlrobin@FreeBSD.org</email>">
 
-<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.ORG</email>">
+<!ENTITY a.jmacd  "Joshua Peck Macdonald <email>jmacd@FreeBSD.org</email>">
 
-<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.ORG</email>">
+<!ENTITY a.jmb  "Jonathan M. Bresler <email>jmb@FreeBSD.org</email>">
 
-<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.ORG</email>">
+<!ENTITY a.jmg  "John-Mark Gurney <email>jmg@FreeBSD.org</email>">
 
-<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.ORG</email>">
+<!ENTITY a.jmz  "Jean-Marc Zucconi <email>jmz@FreeBSD.org</email>">
 
-<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.ORG</email>">
+<!ENTITY a.joerg "J&ouml;rg Wunsch <email>joerg@FreeBSD.org</email>">
 
-<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.ORG</email>">
+<!ENTITY a.john "John Cavanaugh <email>john@FreeBSD.org</email>">
 
-<!ENTITY a.jraynard "James Raynard <email>jraynard@freebsd.org</email>">
+<!ENTITY a.jraynard "James Raynard <email>jraynard@FreeBSD.org</email>">
 
-<!ENTITY a.jseger "Justin Seger <email>jseger@freebsd.org</email>">
+<!ENTITY a.jseger "Justin Seger <email>jseger@FreeBSD.org</email>">
 
-<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.ORG</email>">
+<!ENTITY a.julian  "Julian Elischer <email>julian@FreeBSD.org</email>">
 
-<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.ORG</email>">
+<!ENTITY a.jvh  "Johannes Helander <email>jvh@FreeBSD.org</email>">
 
-<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.ORG</email>">
+<!ENTITY a.karl  "Karl Strickland <email>karl@FreeBSD.org</email>">
 
-<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.ORG</email>">
+<!ENTITY a.kato "Takenori KATO <email>kato@FreeBSD.org</email>">
 
 <!ENTITY a.kelly "Sean Kelly <email>kelly@plutotech.com</email>">
 
-<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.ORG</email>">
+<!ENTITY a.ken "Kenneth D. Merry <email>ken@FreeBSD.org</email>">
 
-<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.ORG</email>">
+<!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>">
 
-<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.ORG</email>">
+<!ENTITY a.kris "Kris Kennaway <email>kris@FreeBSD.org</email>">
 
-<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.ORG</email>">
+<!ENTITY a.kuriyama "Jun Kuriyama <email>kuriyama@FreeBSD.org</email>">
 
-<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.ORG</email>">
+<!ENTITY a.lars  "Lars Fredriksen <email>lars@FreeBSD.org</email>">
 
-<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.ORG</email>">
+<!ENTITY a.ljo  "L Jonas Olsson <email>ljo@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.ORG</email>">
+<!ENTITY a.luoqi "Luoqi Chen <email>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.ORG</email>">
+<!ENTITY a.markm  "Mark Murray <email>markm@FreeBSD.org</email>">
 
-<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.ORG</email>">
+<!ENTITY a.martin  "Martin Renters <email>martin@FreeBSD.org</email>">
 
-<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.ORG</email>">
+<!ENTITY a.max "Masafumi NAKANE <email>max@FreeBSD.org</email>">
 
 <!ENTITY a.mayo "Mark Mayo <email>mark@vmunix.com</email>">
 
-<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.ORG</email>">
+<!ENTITY a.mbarkah "Ade Barkah <email>mbarkah@FreeBSD.org</email>">
 
-<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.ORG</email>">
+<!ENTITY a.mckay "Stephen McKay <email>mckay@FreeBSD.org</email>">
 
-<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.ORG</email>">
+<!ENTITY a.mckusick "Kirk McKusick <email>mckusick@FreeBSD.org</email>">
 
 <!ENTITY a.md "Mark Dapoz <email>md@bsc.no</email>">
 
-<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.ORG</email>">
+<!ENTITY a.mharo  "Michael Haro <email>mharo@FreeBSD.org</email>">
 
-<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.ORG</email>">
+<!ENTITY a.mks "Mike Spengler <email>mks@FreeBSD.org</email>">
 
-<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.ORG</email>">
+<!ENTITY a.motoyuki "Motoyuki Konno <email>motoyuki@FreeBSD.org</email>">
 
-<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.ORG</email>">
+<!ENTITY a.mph "Matthew Hunt <email>mph@FreeBSD.org</email>">
 
-<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.ORG</email>">
+<!ENTITY a.mpp  "Mike Pritchard <email>mpp@FreeBSD.org</email>">
 
-<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.ORG</email>">
+<!ENTITY a.msmith "Michael Smith <email>msmith@FreeBSD.org</email>">
 
-<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.ORG</email>">
+<!ENTITY a.nate  "Nate Williams <email>nate@FreeBSD.org</email>">
 
-<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.ORG</email>">
+<!ENTITY a.nectar "Jacques Vidrine <email>nectar@FreeBSD.org</email>">
 
-<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.ORG</email>">
+<!ENTITY a.newton "Mark Newton <email>newton@FreeBSD.org</email>">
 
-<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.ORG</email>">
+<!ENTITY a.nhibma "Nick Hibma <email>n_hibma@FreeBSD.org</email>">
 
-<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.ORG</email>">
+<!ENTITY a.nik "Nik Clayton <email>nik@FreeBSD.org</email>">
 
-<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.ORG</email>">
+<!ENTITY a.nsayer  "Nick Sayer <email>nsayer@FreeBSD.org</email>">
 
-<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.ORG</email>">
+<!ENTITY a.nsj "Nate Johnson <email>nsj@FreeBSD.org</email>">
 
-<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.ORG</email>">
+<!ENTITY a.obrien "David O'Brien <email>obrien@FreeBSD.org</email>">
 
-<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.ORG</email>">
+<!ENTITY a.olah  "Andras Olah <email>olah@FreeBSD.org</email>">
 
 <!ENTITY a.opsys "Chris Watson <email>opsys@open-systems.net</email>">
 
-<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.ORG</email>">
+<!ENTITY a.paul "Paul Richards <email>paul@FreeBSD.org</email>">
 
 <!ENTITY a.pb "Pierre Beyssac <email>pb@fasterix.freenix.org</email>">
 
-<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.ORG</email>">
+<!ENTITY a.pds "Peter da Silva <email>pds@FreeBSD.org</email>">
 
-<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.ORG</email>">
+<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
 
-<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.ORG</email>">
+<!ENTITY a.phk "Poul-Henning Kamp <email>phk@FreeBSD.org</email>">
 
 <!ENTITY a.pjc "Peter Childs <email>pjchilds@imforei.apana.org.au</email>">
 
-<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.ORG</email>">
+<!ENTITY a.proven  "Chris Provenzano <email>proven@FreeBSD.org</email>">
 
-<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.ORG</email>">
+<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
 
-<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.ORG</email>">
+<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
 
 <!ENTITY a.rhuff "Robert Huff <email>rhuff@cybercom.net</email>">
 
 <!ENTITY a.ricardag "Ricardo AG <email>ricardag@ag.com.br</email>">
 
-<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.ORG</email>">
+<!ENTITY a.rich  "Rich Murphey <email>rich@FreeBSD.org</email>">
 
-<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.ORG</email>">
+<!ENTITY a.rnordier "Robert Nordier <email>rnordier@FreeBSD.org</email>">
 
-<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.ORG</email>">
+<!ENTITY a.roberto  "Ollivier Robert <email>roberto@FreeBSD.org</email>">
 
-<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.ORG</email>">
+<!ENTITY a.rse  "Ralf S. Engelschall <email>rse@FreeBSD.org</email>">
 
-<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.ORG</email>">
+<!ENTITY a.ru "Ruslan Ermilov <email>ru@FreeBSD.org</email>">
 
-<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.ORG</email>">
+<!ENTITY a.sada "Kenji SADA <email>sada@FreeBSD.org</email>">
 
-<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.ORG</email>">
+<!ENTITY a.scrappy "Marc G. Fournier <email>scrappy@FreeBSD.org</email>">
 
-<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.ORG</email>">
+<!ENTITY a.se  "Stefan Esser <email>se@FreeBSD.org</email>">
 
-<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.ORG</email>">
+<!ENTITY a.sef  "Sean Eric Fagan <email>sef@FreeBSD.org</email>">
 
-<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.ORG</email>">
+<!ENTITY a.shige "Shigeyuki Fukushima <email>shige@FreeBSD.org</email>">
 
-<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.ORG</email>">
+<!ENTITY a.simokawa "Hidetoshi Shimokawa <email>simokawa@FreeBSD.org</email>">
 
-<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.ORG</email>">
+<!ENTITY a.smace  "Scott Mace <email>smace@FreeBSD.org</email>">
 
-<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.ORG</email>">
+<!ENTITY a.smpatel "Sujal Patel <email>smpatel@FreeBSD.org</email>">
 
-<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.ORG</email>">
+<!ENTITY a.sos  "S&oslash;ren Schmidt <email>sos@FreeBSD.org</email>">
 
-<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.ORG</email>">
+<!ENTITY a.stark "Gene Stark <email>stark@FreeBSD.org</email>">
 
-<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.ORG</email>">
+<!ENTITY a.stb "Stefan Bethke <email>stb@FreeBSD.org</email>">
 
-<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.ORG</email>">
+<!ENTITY a.steve "Steve Price <email>steve@FreeBSD.org</email>">
 
-<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.ORG</email>">
+<!ENTITY a.swallace  "Steven Wallace <email>swallace@FreeBSD.org</email>">
 
-<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.ORG</email>">
+<!ENTITY a.taoka  "Satoshi Taoka <email>taoka@FreeBSD.org</email>">
 
-<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.ORG</email>">
+<!ENTITY a.tedm "Ted Mittelstaedt <email>tedm@FreeBSD.org</email>">
 
-<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.ORG</email>">
+<!ENTITY a.tegge "Tor Egge <email>tegge@FreeBSD.org</email>">
 
-<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.ORG</email>">
+<!ENTITY a.tg  "Thomas Gellekum <email>tg@FreeBSD.org</email>">
 
-<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.ORG</email>">
+<!ENTITY a.thepish "Peter Hawkins <email>thepish@FreeBSD.org</email>">
 
-<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.ORG</email>">
+<!ENTITY a.torstenb  "Torsten Blum <email>torstenb@FreeBSD.org</email>">
 
-<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.ORG</email>">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis <email>truckman@FreeBSD.org</email>">
 
-<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.ORG</email>">
+<!ENTITY a.ugen  "Ugen J.S.Antsilevich <email>ugen@FreeBSD.org</email>">
 
-<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.ORG</email>">
+<!ENTITY a.uhclem "Frank Durda IV <email>uhclem@FreeBSD.org</email>">
 
-<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.ORG</email>">
+<!ENTITY a.ulf "Ulf Zimmermann <email>ulf@FreeBSD.org</email>">
 
-<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.ORG</email>">
+<!ENTITY a.vanilla "Vanilla I. Shu <email>vanilla@FreeBSD.org</email>">
 
-<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.ORG</email>">
+<!ENTITY a.wes "Wes Peters <email>wes@FreeBSD.org</email>">
 
 <!ENTITY a.whiteside "Don Whiteside <email>whiteside@acm.org</email>">
 
@@ -350,10 +350,10 @@
 
 <!ENTITY a.wlloyd "Bill Lloyd <email>wlloyd@mpd.ca</email>">
 
-<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.ORG</email>">
+<!ENTITY a.wollman "Garrett Wollman <email>wollman@FreeBSD.org</email>">
 
-<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.ORG</email>">
+<!ENTITY a.wosch  "Wolfram Schneider <email>wosch@FreeBSD.org</email>">
 
-<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.ORG</email>">
+<!ENTITY a.wpaul  "Bill Paul <email>wpaul@FreeBSD.org</email>">
 
-<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.ORG</email>">
+<!ENTITY a.yokota  "Kazutaka YOKOTA <email>yokota@FreeBSD.org</email>">