diff --git a/en/handbook/authors.ent b/en/handbook/authors.ent
index a1a991d01c..3527cb4ca6 100644
--- a/en/handbook/authors.ent
+++ b/en/handbook/authors.ent
@@ -1,379 +1,381 @@
abial@FreeBSD.org">
ache@FreeBSD.org">
adam@FreeBSD.org">
alc@FreeBSD.org">
alex@FreeBSD.org">
amurai@FreeBSD.org">
andreas@FreeBSD.org">
archie@FreeBSD.org">
asami@FreeBSD.org">
ats@FreeBSD.org">
awebster@pubnix.net">
bde@FreeBSD.org">
billf@FreeBSD.org">
brandon@FreeBSD.org">
brian@FreeBSD.org">
cawimm@FreeBSD.org">
charnier@FreeBSD.org">
chuckr@glue.umd.edu">
chuckr@FreeBSD.org">
cpiazza@FreeBSD.org">
cracauer@FreeBSD.org">
csgr@FreeBSD.org">
cwt@FreeBSD.org">
danny@FreeBSD.org">
darrenr@FreeBSD.org">
davidn@blaze.net.au">
dbaker@FreeBSD.org">
dburr@FreeBSD.org">
dcs@FreeBSD.org">
deischen@FreeBSD.org">
des@FreeBSD.org">
dfr@FreeBSD.org">
dg@FreeBSD.org">
dick@FreeBSD.org">
dillon@FreeBSD.org">
dima@FreeBSD.org">
dirk@FreeBSD.org">
Dirk.vanGulik@jrc.it">
dt@FreeBSD.org">
dufault@FreeBSD.org">
dwhite@FreeBSD.org">
dyson@FreeBSD.org">
eivind@FreeBSD.org">
ejc@FreeBSD.org">
erich@FreeBSD.org">
faq@FreeBSD.org">
fenner@FreeBSD.org">
flathill@FreeBSD.org">
foxfair@FreeBSD.org">
fsmp@FreeBSD.org">
gallatin@FreeBSD.org">
gclarkii@FreeBSD.org">
gehenna@FreeBSD.org">
gena@NetVision.net.il">
ghelmer@cs.iastate.edu">
gibbs@FreeBSD.org">
gj@FreeBSD.org">
gpalmer@FreeBSD.org">
graichen@FreeBSD.org">
green@FreeBSD.org">
grog@FreeBSD.org">
gryphon@healer.com">
guido@FreeBSD.org">
hanai@FreeBSD.org">
handy@sxt4.physics.montana.edu">
helbig@FreeBSD.org">
hm@FreeBSD.org">
hoek@FreeBSD.org">
hosokawa@FreeBSD.org">
hsu@FreeBSD.org">
imp@FreeBSD.org">
itojun@itojun.org">
iwasaki@FreeBSD.org">
jasone@FreeBSD.org">
jb@cimlogic.com.au">
jdp@FreeBSD.org">
jehamby@lightside.com">
jfieber@FreeBSD.org">
jfitz@FreeBSD.org">
jgreco@FreeBSD.org">
jhay@FreeBSD.org">
jhs@FreeBSD.org">
jkh@FreeBSD.org">
jkoshy@FreeBSD.org">
jlemon@FreeBSD.org">
john@starfire.MN.ORG">
jlrobin@FreeBSD.org">
jmacd@FreeBSD.org">
jmb@FreeBSD.org">
jmg@FreeBSD.org">
jmz@FreeBSD.org">
joerg@FreeBSD.org">
john@FreeBSD.org">
jraynard@FreeBSD.org">
jseger@FreeBSD.org">
julian@FreeBSD.org">
jvh@FreeBSD.org">
karl@FreeBSD.org">
kato@FreeBSD.org">
kelly@plutotech.com">
ken@FreeBSD.org">
kjc@FreeBSD.org">
kris@FreeBSD.org">
kuriyama@FreeBSD.org">
lars@FreeBSD.org">
lile@FreeBSD.org">
ljo@FreeBSD.org">
luoqi@FreeBSD.org">
+marcel@FreeBSD.org">
+
markm@FreeBSD.org">
martin@FreeBSD.org">
max@FreeBSD.org">
mark@vmunix.com">
mbarkah@FreeBSD.org">
mckay@FreeBSD.org">
mckusick@FreeBSD.org">
md@bsc.no">
mharo@FreeBSD.org">
mjacob@FreeBSD.org">
mks@FreeBSD.org">
motoyuki@FreeBSD.org">
mph@FreeBSD.org">
mpp@FreeBSD.org">
msmith@FreeBSD.org">
nate@FreeBSD.org">
nectar@FreeBSD.org">
newton@FreeBSD.org">
n_hibma@FreeBSD.org">
nik@FreeBSD.org">
nsayer@FreeBSD.org">
nsj@FreeBSD.org">
nyan@FreeBSD.org">
obrien@FreeBSD.org">
olah@FreeBSD.org">
opsys@open-systems.net">
paul@FreeBSD.org">
pb@fasterix.freenix.org">
pds@FreeBSD.org">
peter@FreeBSD.org">
phk@FreeBSD.org">
pjchilds@imforei.apana.org.au">
proven@FreeBSD.org">
pst@FreeBSD.org">
rgrimes@FreeBSD.org">
rhuff@cybercom.net">
ricardag@ag.com.br">
rich@FreeBSD.org">
rnordier@FreeBSD.org">
roberto@FreeBSD.org">
rse@FreeBSD.org">
ru@FreeBSD.org">
sada@FreeBSD.org">
scrappy@FreeBSD.org">
se@FreeBSD.org">
sef@FreeBSD.org">
sheldonh@FreeBSD.org">
shige@FreeBSD.org">
simokawa@FreeBSD.org">
smace@FreeBSD.org">
smpatel@FreeBSD.org">
sos@FreeBSD.org">
stark@FreeBSD.org">
stb@FreeBSD.org">
steve@FreeBSD.org">
swallace@FreeBSD.org">
taoka@FreeBSD.org">
tedm@FreeBSD.org">
tegge@FreeBSD.org">
tg@FreeBSD.org">
thepish@FreeBSD.org">
tom@freebsd.org">
torstenb@FreeBSD.org">
truckman@FreeBSD.org">
ugen@FreeBSD.org">
uhclem@FreeBSD.org">
ulf@FreeBSD.org">
vanilla@FreeBSD.org">
wes@FreeBSD.org">
whiteside@acm.org">
wilko@yedi.iaf.nl">
wlloyd@mpd.ca">
wollman@FreeBSD.org">
wosch@FreeBSD.org">
wpaul@FreeBSD.org">
yokota@FreeBSD.org">
diff --git a/en/handbook/staff/chapter.sgml b/en/handbook/staff/chapter.sgml
index b82c606d88..75ede0e195 100644
--- a/en/handbook/staff/chapter.sgml
+++ b/en/handbook/staff/chapter.sgml
@@ -1,893 +1,897 @@
FreeBSD Project Staff
The FreeBSD Project is managed and operated by the following groups of
people:
The FreeBSD Core Team
The FreeBSD core team constitutes the project's “Board of
Directors”, responsible for deciding the project's overall goals
and direction as well as managing specific
areas of the FreeBSD project landscape.
(in alphabetical order by last name):
&a.asami;
&a.jmb;
&a.ache;
&a.bde;
&a.gibbs;
&a.dg;
&a.jkh;
&a.phk;
&a.rich;
&a.gpalmer;
&a.jdp;
&a.dfr;
&a.sos;
&a.peter;
&a.wollman;
&a.joerg;
The FreeBSD Developers
These are the people who have commit privileges and do the
engineering work on the FreeBSD source tree. All core team members are
also developers.
&a.ugen;
&a.dbaker;
&a.mbarkah;
&a.stb;
&a.pb;
&a.abial;
&a.jb;
&a.torstenb;
&a.dburr;
&a.charnier;
&a.luoqi;
&a.ejc;
&a.kjc;
&a.gclarkii;
&a.archie;
&a.alc;
&a.cracauer;
&a.adam;
&a.dillon;
&a.dufault;
&a.uhclem;
&a.tegge;
&a.deischen;
&a.eivind;
&a.julian;
&a.rse;
&a.ru;
&a.se;
&a.jasone;
&a.sef;
&a.green;
&a.fenner;
&a.jfieber;
&a.jfitz;
&a.scrappy;
&a.lars;
&a.lile;
&a.dirk;
&a.shige;
&a.billf;
&a.gallatin;
&a.tg;
&a.brandon;
&a.graichen;
&a.jgreco;
&a.rgrimes;
&a.jmg;
&a.hanai;
&a.mharo;
&a.thepish;
&a.jhay;
&a.sheldonh;
&a.helbig;
&a.ghelmer;
&a.erich;
&a.nhibma;
&a.flathill;
&a.hosokawa;
&a.hsu;
&a.foxfair;
&a.tom;
&a.mph;
&a.itojun;
&a.iwasaki;
&a.mjacob;
&a.gj;
&a.nsj;
&a.ljo;
&a.kato;
&a.andreas;
&a.motoyuki;
&a.jkoshy;
&a.kuriyama;
&a.grog;
&a.jlemon;
&a.truckman;
&a.imp;
&a.jmacd;
&a.smace;
&a.gehenna;
&a.mckay;
&a.mckusick;
&a.ken;
&a.hm;
&a.tedm;
+
+ &a.marcel;
+
+
&a.amurai;
&a.markm;
&a.max;
&a.newton;
&a.rnordier;
&a.davidn;
&a.obrien;
&a.danny;
&a.ljo;
&a.fsmp;
&a.smpatel;
&a.wpaul;
&a.wes;
&a.cpiazza;
&a.steve;
&a.mpp;
&a.jraynard;
&a.darrenr;
&a.csgr;
&a.martin;
&a.paul;
&a.roberto;
&a.chuckr;
&a.guido;
&a.dima;
&a.sada;
&a.nsayer;
&a.wosch;
&a.ats;
&a.dick;
&a.jseger;
&a.simokawa;
&a.vanilla;
&a.msmith;
&a.des;
&a.brian;
&a.mks;
&a.stark;
&a.karl;
&a.nyan;
&a.taoka;
&a.dt;
&a.cwt;
&a.pst;
&a.hoek;
&a.nectar;
&a.swallace;
&a.dwhite;
&a.nate;
&a.yokota;
&a.jmz;
The FreeBSD Documentation Project
The FreeBSD
Documentation Project is responsible for a number of different
services, each service being run by an individual and his
deputies (if any):
Documentation Project Manager
&a.nik;
Webmaster
&a.wosch;
Handbook & FAQ Editor
&a.faq;
News Editor
&a.nsj;
Deputy: &a.john;
In the Press Editor
&a.jkoshy
FreeBSD Really-Quick NewsLetter Editor
Chris Coleman chrisc@vmunix.com
Gallery Editor
&a.nsj;
Deputy: &a.cawimm;
Commercial Editor
&a.nik;
Web Changes Editor
-
User Groups Editor
-
LinuxDoc to DocBook conversion
&a.nik;
Who Is Responsible for What
Principal Architect
&a.dg;
Documentation
Project Manager
&a.nik;
Internationalization
&a.ache;
Networking
&a.wollman;
Postmaster
&a.jmb;
Release Coordinator
&a.jkh;
Public Relations & Corporate Liaison
&a.jkh;
Security
Officer
&a.imp;
Source
Repository Managers
Principal: &a.peter;
Assistant: &a.jdp;
International (Crypto): &a.markm;
Ports
Manager
&a.asami;
XFree86 Project, Inc. Liaison
&a.rich;
Usenet Support
&a.joerg;
GNATS
Administrator
&a.steve;
Webmaster
&a.wosch;
diff --git a/en_US.ISO8859-1/books/handbook/authors.ent b/en_US.ISO8859-1/books/handbook/authors.ent
index a1a991d01c..3527cb4ca6 100644
--- a/en_US.ISO8859-1/books/handbook/authors.ent
+++ b/en_US.ISO8859-1/books/handbook/authors.ent
@@ -1,379 +1,381 @@
abial@FreeBSD.org">
ache@FreeBSD.org">
adam@FreeBSD.org">
alc@FreeBSD.org">
alex@FreeBSD.org">
amurai@FreeBSD.org">
andreas@FreeBSD.org">
archie@FreeBSD.org">
asami@FreeBSD.org">
ats@FreeBSD.org">
awebster@pubnix.net">
bde@FreeBSD.org">
billf@FreeBSD.org">
brandon@FreeBSD.org">
brian@FreeBSD.org">
cawimm@FreeBSD.org">
charnier@FreeBSD.org">
chuckr@glue.umd.edu">
chuckr@FreeBSD.org">
cpiazza@FreeBSD.org">
cracauer@FreeBSD.org">
csgr@FreeBSD.org">
cwt@FreeBSD.org">
danny@FreeBSD.org">
darrenr@FreeBSD.org">
davidn@blaze.net.au">
dbaker@FreeBSD.org">
dburr@FreeBSD.org">
dcs@FreeBSD.org">
deischen@FreeBSD.org">
des@FreeBSD.org">
dfr@FreeBSD.org">
dg@FreeBSD.org">
dick@FreeBSD.org">
dillon@FreeBSD.org">
dima@FreeBSD.org">
dirk@FreeBSD.org">
Dirk.vanGulik@jrc.it">
dt@FreeBSD.org">
dufault@FreeBSD.org">
dwhite@FreeBSD.org">
dyson@FreeBSD.org">
eivind@FreeBSD.org">
ejc@FreeBSD.org">
erich@FreeBSD.org">
faq@FreeBSD.org">
fenner@FreeBSD.org">
flathill@FreeBSD.org">
foxfair@FreeBSD.org">
fsmp@FreeBSD.org">
gallatin@FreeBSD.org">
gclarkii@FreeBSD.org">
gehenna@FreeBSD.org">
gena@NetVision.net.il">
ghelmer@cs.iastate.edu">
gibbs@FreeBSD.org">
gj@FreeBSD.org">
gpalmer@FreeBSD.org">
graichen@FreeBSD.org">
green@FreeBSD.org">
grog@FreeBSD.org">
gryphon@healer.com">
guido@FreeBSD.org">
hanai@FreeBSD.org">
handy@sxt4.physics.montana.edu">
helbig@FreeBSD.org">
hm@FreeBSD.org">
hoek@FreeBSD.org">
hosokawa@FreeBSD.org">
hsu@FreeBSD.org">
imp@FreeBSD.org">
itojun@itojun.org">
iwasaki@FreeBSD.org">
jasone@FreeBSD.org">
jb@cimlogic.com.au">
jdp@FreeBSD.org">
jehamby@lightside.com">
jfieber@FreeBSD.org">
jfitz@FreeBSD.org">
jgreco@FreeBSD.org">
jhay@FreeBSD.org">
jhs@FreeBSD.org">
jkh@FreeBSD.org">
jkoshy@FreeBSD.org">
jlemon@FreeBSD.org">
john@starfire.MN.ORG">
jlrobin@FreeBSD.org">
jmacd@FreeBSD.org">
jmb@FreeBSD.org">
jmg@FreeBSD.org">
jmz@FreeBSD.org">
joerg@FreeBSD.org">
john@FreeBSD.org">
jraynard@FreeBSD.org">
jseger@FreeBSD.org">
julian@FreeBSD.org">
jvh@FreeBSD.org">
karl@FreeBSD.org">
kato@FreeBSD.org">
kelly@plutotech.com">
ken@FreeBSD.org">
kjc@FreeBSD.org">
kris@FreeBSD.org">
kuriyama@FreeBSD.org">
lars@FreeBSD.org">
lile@FreeBSD.org">
ljo@FreeBSD.org">
luoqi@FreeBSD.org">
+marcel@FreeBSD.org">
+
markm@FreeBSD.org">
martin@FreeBSD.org">
max@FreeBSD.org">
mark@vmunix.com">
mbarkah@FreeBSD.org">
mckay@FreeBSD.org">
mckusick@FreeBSD.org">
md@bsc.no">
mharo@FreeBSD.org">
mjacob@FreeBSD.org">
mks@FreeBSD.org">
motoyuki@FreeBSD.org">
mph@FreeBSD.org">
mpp@FreeBSD.org">
msmith@FreeBSD.org">
nate@FreeBSD.org">
nectar@FreeBSD.org">
newton@FreeBSD.org">
n_hibma@FreeBSD.org">
nik@FreeBSD.org">
nsayer@FreeBSD.org">
nsj@FreeBSD.org">
nyan@FreeBSD.org">
obrien@FreeBSD.org">
olah@FreeBSD.org">
opsys@open-systems.net">
paul@FreeBSD.org">
pb@fasterix.freenix.org">
pds@FreeBSD.org">
peter@FreeBSD.org">
phk@FreeBSD.org">
pjchilds@imforei.apana.org.au">
proven@FreeBSD.org">
pst@FreeBSD.org">
rgrimes@FreeBSD.org">
rhuff@cybercom.net">
ricardag@ag.com.br">
rich@FreeBSD.org">
rnordier@FreeBSD.org">
roberto@FreeBSD.org">
rse@FreeBSD.org">
ru@FreeBSD.org">
sada@FreeBSD.org">
scrappy@FreeBSD.org">
se@FreeBSD.org">
sef@FreeBSD.org">
sheldonh@FreeBSD.org">
shige@FreeBSD.org">
simokawa@FreeBSD.org">
smace@FreeBSD.org">
smpatel@FreeBSD.org">
sos@FreeBSD.org">
stark@FreeBSD.org">
stb@FreeBSD.org">
steve@FreeBSD.org">
swallace@FreeBSD.org">
taoka@FreeBSD.org">
tedm@FreeBSD.org">
tegge@FreeBSD.org">
tg@FreeBSD.org">
thepish@FreeBSD.org">
tom@freebsd.org">
torstenb@FreeBSD.org">
truckman@FreeBSD.org">
ugen@FreeBSD.org">
uhclem@FreeBSD.org">
ulf@FreeBSD.org">
vanilla@FreeBSD.org">
wes@FreeBSD.org">
whiteside@acm.org">
wilko@yedi.iaf.nl">
wlloyd@mpd.ca">
wollman@FreeBSD.org">
wosch@FreeBSD.org">
wpaul@FreeBSD.org">
yokota@FreeBSD.org">
diff --git a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
index b82c606d88..75ede0e195 100644
--- a/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/staff/chapter.sgml
@@ -1,893 +1,897 @@
FreeBSD Project Staff
The FreeBSD Project is managed and operated by the following groups of
people:
The FreeBSD Core Team
The FreeBSD core team constitutes the project's “Board of
Directors”, responsible for deciding the project's overall goals
and direction as well as managing specific
areas of the FreeBSD project landscape.
(in alphabetical order by last name):
&a.asami;
&a.jmb;
&a.ache;
&a.bde;
&a.gibbs;
&a.dg;
&a.jkh;
&a.phk;
&a.rich;
&a.gpalmer;
&a.jdp;
&a.dfr;
&a.sos;
&a.peter;
&a.wollman;
&a.joerg;
The FreeBSD Developers
These are the people who have commit privileges and do the
engineering work on the FreeBSD source tree. All core team members are
also developers.
&a.ugen;
&a.dbaker;
&a.mbarkah;
&a.stb;
&a.pb;
&a.abial;
&a.jb;
&a.torstenb;
&a.dburr;
&a.charnier;
&a.luoqi;
&a.ejc;
&a.kjc;
&a.gclarkii;
&a.archie;
&a.alc;
&a.cracauer;
&a.adam;
&a.dillon;
&a.dufault;
&a.uhclem;
&a.tegge;
&a.deischen;
&a.eivind;
&a.julian;
&a.rse;
&a.ru;
&a.se;
&a.jasone;
&a.sef;
&a.green;
&a.fenner;
&a.jfieber;
&a.jfitz;
&a.scrappy;
&a.lars;
&a.lile;
&a.dirk;
&a.shige;
&a.billf;
&a.gallatin;
&a.tg;
&a.brandon;
&a.graichen;
&a.jgreco;
&a.rgrimes;
&a.jmg;
&a.hanai;
&a.mharo;
&a.thepish;
&a.jhay;
&a.sheldonh;
&a.helbig;
&a.ghelmer;
&a.erich;
&a.nhibma;
&a.flathill;
&a.hosokawa;
&a.hsu;
&a.foxfair;
&a.tom;
&a.mph;
&a.itojun;
&a.iwasaki;
&a.mjacob;
&a.gj;
&a.nsj;
&a.ljo;
&a.kato;
&a.andreas;
&a.motoyuki;
&a.jkoshy;
&a.kuriyama;
&a.grog;
&a.jlemon;
&a.truckman;
&a.imp;
&a.jmacd;
&a.smace;
&a.gehenna;
&a.mckay;
&a.mckusick;
&a.ken;
&a.hm;
&a.tedm;
+
+ &a.marcel;
+
+
&a.amurai;
&a.markm;
&a.max;
&a.newton;
&a.rnordier;
&a.davidn;
&a.obrien;
&a.danny;
&a.ljo;
&a.fsmp;
&a.smpatel;
&a.wpaul;
&a.wes;
&a.cpiazza;
&a.steve;
&a.mpp;
&a.jraynard;
&a.darrenr;
&a.csgr;
&a.martin;
&a.paul;
&a.roberto;
&a.chuckr;
&a.guido;
&a.dima;
&a.sada;
&a.nsayer;
&a.wosch;
&a.ats;
&a.dick;
&a.jseger;
&a.simokawa;
&a.vanilla;
&a.msmith;
&a.des;
&a.brian;
&a.mks;
&a.stark;
&a.karl;
&a.nyan;
&a.taoka;
&a.dt;
&a.cwt;
&a.pst;
&a.hoek;
&a.nectar;
&a.swallace;
&a.dwhite;
&a.nate;
&a.yokota;
&a.jmz;
The FreeBSD Documentation Project
The FreeBSD
Documentation Project is responsible for a number of different
services, each service being run by an individual and his
deputies (if any):
Documentation Project Manager
&a.nik;
Webmaster
&a.wosch;
Handbook & FAQ Editor
&a.faq;
News Editor
&a.nsj;
Deputy: &a.john;
In the Press Editor
&a.jkoshy
FreeBSD Really-Quick NewsLetter Editor
Chris Coleman chrisc@vmunix.com
Gallery Editor
&a.nsj;
Deputy: &a.cawimm;
Commercial Editor
&a.nik;
Web Changes Editor
-
User Groups Editor
-
LinuxDoc to DocBook conversion
&a.nik;
Who Is Responsible for What
Principal Architect
&a.dg;
Documentation
Project Manager
&a.nik;
Internationalization
&a.ache;
Networking
&a.wollman;
Postmaster
&a.jmb;
Release Coordinator
&a.jkh;
Public Relations & Corporate Liaison
&a.jkh;
Security
Officer
&a.imp;
Source
Repository Managers
Principal: &a.peter;
Assistant: &a.jdp;
International (Crypto): &a.markm;
Ports
Manager
&a.asami;
XFree86 Project, Inc. Liaison
&a.rich;
Usenet Support
&a.joerg;
GNATS
Administrator
&a.steve;
Webmaster
&a.wosch;
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index a1a991d01c..3527cb4ca6 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1,379 +1,381 @@
abial@FreeBSD.org">
ache@FreeBSD.org">
adam@FreeBSD.org">
alc@FreeBSD.org">
alex@FreeBSD.org">
amurai@FreeBSD.org">
andreas@FreeBSD.org">
archie@FreeBSD.org">
asami@FreeBSD.org">
ats@FreeBSD.org">
awebster@pubnix.net">
bde@FreeBSD.org">
billf@FreeBSD.org">
brandon@FreeBSD.org">
brian@FreeBSD.org">
cawimm@FreeBSD.org">
charnier@FreeBSD.org">
chuckr@glue.umd.edu">
chuckr@FreeBSD.org">
cpiazza@FreeBSD.org">
cracauer@FreeBSD.org">
csgr@FreeBSD.org">
cwt@FreeBSD.org">
danny@FreeBSD.org">
darrenr@FreeBSD.org">
davidn@blaze.net.au">
dbaker@FreeBSD.org">
dburr@FreeBSD.org">
dcs@FreeBSD.org">
deischen@FreeBSD.org">
des@FreeBSD.org">
dfr@FreeBSD.org">
dg@FreeBSD.org">
dick@FreeBSD.org">
dillon@FreeBSD.org">
dima@FreeBSD.org">
dirk@FreeBSD.org">
Dirk.vanGulik@jrc.it">
dt@FreeBSD.org">
dufault@FreeBSD.org">
dwhite@FreeBSD.org">
dyson@FreeBSD.org">
eivind@FreeBSD.org">
ejc@FreeBSD.org">
erich@FreeBSD.org">
faq@FreeBSD.org">
fenner@FreeBSD.org">
flathill@FreeBSD.org">
foxfair@FreeBSD.org">
fsmp@FreeBSD.org">
gallatin@FreeBSD.org">
gclarkii@FreeBSD.org">
gehenna@FreeBSD.org">
gena@NetVision.net.il">
ghelmer@cs.iastate.edu">
gibbs@FreeBSD.org">
gj@FreeBSD.org">
gpalmer@FreeBSD.org">
graichen@FreeBSD.org">
green@FreeBSD.org">
grog@FreeBSD.org">
gryphon@healer.com">
guido@FreeBSD.org">
hanai@FreeBSD.org">
handy@sxt4.physics.montana.edu">
helbig@FreeBSD.org">
hm@FreeBSD.org">
hoek@FreeBSD.org">
hosokawa@FreeBSD.org">
hsu@FreeBSD.org">
imp@FreeBSD.org">
itojun@itojun.org">
iwasaki@FreeBSD.org">
jasone@FreeBSD.org">
jb@cimlogic.com.au">
jdp@FreeBSD.org">
jehamby@lightside.com">
jfieber@FreeBSD.org">
jfitz@FreeBSD.org">
jgreco@FreeBSD.org">
jhay@FreeBSD.org">
jhs@FreeBSD.org">
jkh@FreeBSD.org">
jkoshy@FreeBSD.org">
jlemon@FreeBSD.org">
john@starfire.MN.ORG">
jlrobin@FreeBSD.org">
jmacd@FreeBSD.org">
jmb@FreeBSD.org">
jmg@FreeBSD.org">
jmz@FreeBSD.org">
joerg@FreeBSD.org">
john@FreeBSD.org">
jraynard@FreeBSD.org">
jseger@FreeBSD.org">
julian@FreeBSD.org">
jvh@FreeBSD.org">
karl@FreeBSD.org">
kato@FreeBSD.org">
kelly@plutotech.com">
ken@FreeBSD.org">
kjc@FreeBSD.org">
kris@FreeBSD.org">
kuriyama@FreeBSD.org">
lars@FreeBSD.org">
lile@FreeBSD.org">
ljo@FreeBSD.org">
luoqi@FreeBSD.org">
+marcel@FreeBSD.org">
+
markm@FreeBSD.org">
martin@FreeBSD.org">
max@FreeBSD.org">
mark@vmunix.com">
mbarkah@FreeBSD.org">
mckay@FreeBSD.org">
mckusick@FreeBSD.org">
md@bsc.no">
mharo@FreeBSD.org">
mjacob@FreeBSD.org">
mks@FreeBSD.org">
motoyuki@FreeBSD.org">
mph@FreeBSD.org">
mpp@FreeBSD.org">
msmith@FreeBSD.org">
nate@FreeBSD.org">
nectar@FreeBSD.org">
newton@FreeBSD.org">
n_hibma@FreeBSD.org">
nik@FreeBSD.org">
nsayer@FreeBSD.org">
nsj@FreeBSD.org">
nyan@FreeBSD.org">
obrien@FreeBSD.org">
olah@FreeBSD.org">
opsys@open-systems.net">
paul@FreeBSD.org">
pb@fasterix.freenix.org">
pds@FreeBSD.org">
peter@FreeBSD.org">
phk@FreeBSD.org">
pjchilds@imforei.apana.org.au">
proven@FreeBSD.org">
pst@FreeBSD.org">
rgrimes@FreeBSD.org">
rhuff@cybercom.net">
ricardag@ag.com.br">
rich@FreeBSD.org">
rnordier@FreeBSD.org">
roberto@FreeBSD.org">
rse@FreeBSD.org">
ru@FreeBSD.org">
sada@FreeBSD.org">
scrappy@FreeBSD.org">
se@FreeBSD.org">
sef@FreeBSD.org">
sheldonh@FreeBSD.org">
shige@FreeBSD.org">
simokawa@FreeBSD.org">
smace@FreeBSD.org">
smpatel@FreeBSD.org">
sos@FreeBSD.org">
stark@FreeBSD.org">
stb@FreeBSD.org">
steve@FreeBSD.org">
swallace@FreeBSD.org">
taoka@FreeBSD.org">
tedm@FreeBSD.org">
tegge@FreeBSD.org">
tg@FreeBSD.org">
thepish@FreeBSD.org">
tom@freebsd.org">
torstenb@FreeBSD.org">
truckman@FreeBSD.org">
ugen@FreeBSD.org">
uhclem@FreeBSD.org">
ulf@FreeBSD.org">
vanilla@FreeBSD.org">
wes@FreeBSD.org">
whiteside@acm.org">
wilko@yedi.iaf.nl">
wlloyd@mpd.ca">
wollman@FreeBSD.org">
wosch@FreeBSD.org">
wpaul@FreeBSD.org">
yokota@FreeBSD.org">
diff --git a/en_US.ISO_8859-1/books/handbook/authors.ent b/en_US.ISO_8859-1/books/handbook/authors.ent
index a1a991d01c..3527cb4ca6 100644
--- a/en_US.ISO_8859-1/books/handbook/authors.ent
+++ b/en_US.ISO_8859-1/books/handbook/authors.ent
@@ -1,379 +1,381 @@
abial@FreeBSD.org">
ache@FreeBSD.org">
adam@FreeBSD.org">
alc@FreeBSD.org">
alex@FreeBSD.org">
amurai@FreeBSD.org">
andreas@FreeBSD.org">
archie@FreeBSD.org">
asami@FreeBSD.org">
ats@FreeBSD.org">
awebster@pubnix.net">
bde@FreeBSD.org">
billf@FreeBSD.org">
brandon@FreeBSD.org">
brian@FreeBSD.org">
cawimm@FreeBSD.org">
charnier@FreeBSD.org">
chuckr@glue.umd.edu">
chuckr@FreeBSD.org">
cpiazza@FreeBSD.org">
cracauer@FreeBSD.org">
csgr@FreeBSD.org">
cwt@FreeBSD.org">
danny@FreeBSD.org">
darrenr@FreeBSD.org">
davidn@blaze.net.au">
dbaker@FreeBSD.org">
dburr@FreeBSD.org">
dcs@FreeBSD.org">
deischen@FreeBSD.org">
des@FreeBSD.org">
dfr@FreeBSD.org">
dg@FreeBSD.org">
dick@FreeBSD.org">
dillon@FreeBSD.org">
dima@FreeBSD.org">
dirk@FreeBSD.org">
Dirk.vanGulik@jrc.it">
dt@FreeBSD.org">
dufault@FreeBSD.org">
dwhite@FreeBSD.org">
dyson@FreeBSD.org">
eivind@FreeBSD.org">
ejc@FreeBSD.org">
erich@FreeBSD.org">
faq@FreeBSD.org">
fenner@FreeBSD.org">
flathill@FreeBSD.org">
foxfair@FreeBSD.org">
fsmp@FreeBSD.org">
gallatin@FreeBSD.org">
gclarkii@FreeBSD.org">
gehenna@FreeBSD.org">
gena@NetVision.net.il">
ghelmer@cs.iastate.edu">
gibbs@FreeBSD.org">
gj@FreeBSD.org">
gpalmer@FreeBSD.org">
graichen@FreeBSD.org">
green@FreeBSD.org">
grog@FreeBSD.org">
gryphon@healer.com">
guido@FreeBSD.org">
hanai@FreeBSD.org">
handy@sxt4.physics.montana.edu">
helbig@FreeBSD.org">
hm@FreeBSD.org">
hoek@FreeBSD.org">
hosokawa@FreeBSD.org">
hsu@FreeBSD.org">
imp@FreeBSD.org">
itojun@itojun.org">
iwasaki@FreeBSD.org">
jasone@FreeBSD.org">
jb@cimlogic.com.au">
jdp@FreeBSD.org">
jehamby@lightside.com">
jfieber@FreeBSD.org">
jfitz@FreeBSD.org">
jgreco@FreeBSD.org">
jhay@FreeBSD.org">
jhs@FreeBSD.org">
jkh@FreeBSD.org">
jkoshy@FreeBSD.org">
jlemon@FreeBSD.org">
john@starfire.MN.ORG">
jlrobin@FreeBSD.org">
jmacd@FreeBSD.org">
jmb@FreeBSD.org">
jmg@FreeBSD.org">
jmz@FreeBSD.org">
joerg@FreeBSD.org">
john@FreeBSD.org">
jraynard@FreeBSD.org">
jseger@FreeBSD.org">
julian@FreeBSD.org">
jvh@FreeBSD.org">
karl@FreeBSD.org">
kato@FreeBSD.org">
kelly@plutotech.com">
ken@FreeBSD.org">
kjc@FreeBSD.org">
kris@FreeBSD.org">
kuriyama@FreeBSD.org">
lars@FreeBSD.org">
lile@FreeBSD.org">
ljo@FreeBSD.org">
luoqi@FreeBSD.org">
+marcel@FreeBSD.org">
+
markm@FreeBSD.org">
martin@FreeBSD.org">
max@FreeBSD.org">
mark@vmunix.com">
mbarkah@FreeBSD.org">
mckay@FreeBSD.org">
mckusick@FreeBSD.org">
md@bsc.no">
mharo@FreeBSD.org">
mjacob@FreeBSD.org">
mks@FreeBSD.org">
motoyuki@FreeBSD.org">
mph@FreeBSD.org">
mpp@FreeBSD.org">
msmith@FreeBSD.org">
nate@FreeBSD.org">
nectar@FreeBSD.org">
newton@FreeBSD.org">
n_hibma@FreeBSD.org">
nik@FreeBSD.org">
nsayer@FreeBSD.org">
nsj@FreeBSD.org">
nyan@FreeBSD.org">
obrien@FreeBSD.org">
olah@FreeBSD.org">
opsys@open-systems.net">
paul@FreeBSD.org">
pb@fasterix.freenix.org">
pds@FreeBSD.org">
peter@FreeBSD.org">
phk@FreeBSD.org">
pjchilds@imforei.apana.org.au">
proven@FreeBSD.org">
pst@FreeBSD.org">
rgrimes@FreeBSD.org">
rhuff@cybercom.net">
ricardag@ag.com.br">
rich@FreeBSD.org">
rnordier@FreeBSD.org">
roberto@FreeBSD.org">
rse@FreeBSD.org">
ru@FreeBSD.org">
sada@FreeBSD.org">
scrappy@FreeBSD.org">
se@FreeBSD.org">
sef@FreeBSD.org">
sheldonh@FreeBSD.org">
shige@FreeBSD.org">
simokawa@FreeBSD.org">
smace@FreeBSD.org">
smpatel@FreeBSD.org">
sos@FreeBSD.org">
stark@FreeBSD.org">
stb@FreeBSD.org">
steve@FreeBSD.org">
swallace@FreeBSD.org">
taoka@FreeBSD.org">
tedm@FreeBSD.org">
tegge@FreeBSD.org">
tg@FreeBSD.org">
thepish@FreeBSD.org">
tom@freebsd.org">
torstenb@FreeBSD.org">
truckman@FreeBSD.org">
ugen@FreeBSD.org">
uhclem@FreeBSD.org">
ulf@FreeBSD.org">
vanilla@FreeBSD.org">
wes@FreeBSD.org">
whiteside@acm.org">
wilko@yedi.iaf.nl">
wlloyd@mpd.ca">
wollman@FreeBSD.org">
wosch@FreeBSD.org">
wpaul@FreeBSD.org">
yokota@FreeBSD.org">
diff --git a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
index b82c606d88..75ede0e195 100644
--- a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
@@ -1,893 +1,897 @@
FreeBSD Project Staff
The FreeBSD Project is managed and operated by the following groups of
people:
The FreeBSD Core Team
The FreeBSD core team constitutes the project's “Board of
Directors”, responsible for deciding the project's overall goals
and direction as well as managing specific
areas of the FreeBSD project landscape.
(in alphabetical order by last name):
&a.asami;
&a.jmb;
&a.ache;
&a.bde;
&a.gibbs;
&a.dg;
&a.jkh;
&a.phk;
&a.rich;
&a.gpalmer;
&a.jdp;
&a.dfr;
&a.sos;
&a.peter;
&a.wollman;
&a.joerg;
The FreeBSD Developers
These are the people who have commit privileges and do the
engineering work on the FreeBSD source tree. All core team members are
also developers.
&a.ugen;
&a.dbaker;
&a.mbarkah;
&a.stb;
&a.pb;
&a.abial;
&a.jb;
&a.torstenb;
&a.dburr;
&a.charnier;
&a.luoqi;
&a.ejc;
&a.kjc;
&a.gclarkii;
&a.archie;
&a.alc;
&a.cracauer;
&a.adam;
&a.dillon;
&a.dufault;
&a.uhclem;
&a.tegge;
&a.deischen;
&a.eivind;
&a.julian;
&a.rse;
&a.ru;
&a.se;
&a.jasone;
&a.sef;
&a.green;
&a.fenner;
&a.jfieber;
&a.jfitz;
&a.scrappy;
&a.lars;
&a.lile;
&a.dirk;
&a.shige;
&a.billf;
&a.gallatin;
&a.tg;
&a.brandon;
&a.graichen;
&a.jgreco;
&a.rgrimes;
&a.jmg;
&a.hanai;
&a.mharo;
&a.thepish;
&a.jhay;
&a.sheldonh;
&a.helbig;
&a.ghelmer;
&a.erich;
&a.nhibma;
&a.flathill;
&a.hosokawa;
&a.hsu;
&a.foxfair;
&a.tom;
&a.mph;
&a.itojun;
&a.iwasaki;
&a.mjacob;
&a.gj;
&a.nsj;
&a.ljo;
&a.kato;
&a.andreas;
&a.motoyuki;
&a.jkoshy;
&a.kuriyama;
&a.grog;
&a.jlemon;
&a.truckman;
&a.imp;
&a.jmacd;
&a.smace;
&a.gehenna;
&a.mckay;
&a.mckusick;
&a.ken;
&a.hm;
&a.tedm;
+
+ &a.marcel;
+
+
&a.amurai;
&a.markm;
&a.max;
&a.newton;
&a.rnordier;
&a.davidn;
&a.obrien;
&a.danny;
&a.ljo;
&a.fsmp;
&a.smpatel;
&a.wpaul;
&a.wes;
&a.cpiazza;
&a.steve;
&a.mpp;
&a.jraynard;
&a.darrenr;
&a.csgr;
&a.martin;
&a.paul;
&a.roberto;
&a.chuckr;
&a.guido;
&a.dima;
&a.sada;
&a.nsayer;
&a.wosch;
&a.ats;
&a.dick;
&a.jseger;
&a.simokawa;
&a.vanilla;
&a.msmith;
&a.des;
&a.brian;
&a.mks;
&a.stark;
&a.karl;
&a.nyan;
&a.taoka;
&a.dt;
&a.cwt;
&a.pst;
&a.hoek;
&a.nectar;
&a.swallace;
&a.dwhite;
&a.nate;
&a.yokota;
&a.jmz;
The FreeBSD Documentation Project
The FreeBSD
Documentation Project is responsible for a number of different
services, each service being run by an individual and his
deputies (if any):
Documentation Project Manager
&a.nik;
Webmaster
&a.wosch;
Handbook & FAQ Editor
&a.faq;
News Editor
&a.nsj;
Deputy: &a.john;
In the Press Editor
&a.jkoshy
FreeBSD Really-Quick NewsLetter Editor
Chris Coleman chrisc@vmunix.com
Gallery Editor
&a.nsj;
Deputy: &a.cawimm;
Commercial Editor
&a.nik;
Web Changes Editor
-
User Groups Editor
-
LinuxDoc to DocBook conversion
&a.nik;
Who Is Responsible for What
Principal Architect
&a.dg;
Documentation
Project Manager
&a.nik;
Internationalization
&a.ache;
Networking
&a.wollman;
Postmaster
&a.jmb;
Release Coordinator
&a.jkh;
Public Relations & Corporate Liaison
&a.jkh;
Security
Officer
&a.imp;
Source
Repository Managers
Principal: &a.peter;
Assistant: &a.jdp;
International (Crypto): &a.markm;
Ports
Manager
&a.asami;
XFree86 Project, Inc. Liaison
&a.rich;
Usenet Support
&a.joerg;
GNATS
Administrator
&a.steve;
Webmaster
&a.wosch;