diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.sgml
index bb7ea0018b..ba557817e9 100644
--- a/en_US.ISO8859-1/articles/contributors/article.sgml
+++ b/en_US.ISO8859-1/articles/contributors/article.sgml
@@ -1,727 +1,726 @@
%man;
%authors;
%teams;
%mailing-lists;
%freebsd;
%trademarks;
%urls;
%contrib.ent;
]>
Contributors to FreeBSD$FreeBSD$
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.sun;
&tm-attrib.general;
This article lists individuals and organizations who have
made a contribution to FreeBSD.Donors GalleryThe FreeBSD Project is indebted to the following donors and would
like to publicly thank them here!Contributors to the central server
project:The following individuals and businesses made it possible for
the FreeBSD Project to build a new central server machine, which
has replaced freefall.FreeBSD.org at
one point, by donating the following items:&a.mbarkah; and his employer, Hemisphere Online,
donated a Pentium Pro (P6) 200MHz CPUASA
Computers donated a Tyan 1662
motherboard.Joe McGuckin joe@via.net of ViaNet Communications donated
a Kingston ethernet controller.Jack O'Neill jack@diamond.xtalwind.net
donated an NCR 53C875 SCSI controller
card.Ulf Zimmermann ulf@Alameda.net of Alameda Networks donated
128MB of memory, a 4 Gb disk
drive and the case.Direct funding:The following individuals and businesses have generously
contributed direct funding to the project:Annelise Anderson
ANDRSN@HOOVER.STANFORD.EDU&a.dillon;Blue Mountain
ArtsEpilogue Technology
Corporation&a.sef;Global Technology
Associates, IncDon Scott WildeGianmarco Giovannelli
gmarco@masternet.itJosef C. Grosch joeg@truenorth.orgRobert T. Morris&a.chuckr;Kenneth P. Stox ken@stox.sa.enteract.com of
Imaginary Landscape,
LLC.Dmitry S. Kohmanyuk dk@dog.farm.orgLaser5 of Japan
(a portion of the profits from sales of their various FreeBSD
CDROMs).Fuki Shuppan
Publishing Co. donated a portion of their profits from
Hajimete no FreeBSD (FreeBSD, Getting
started) to the FreeBSD and XFree86 projects.ASCII Corp.
donated a portion of their profits from several FreeBSD-related
books to the FreeBSD project.Yokogawa Electric
Corp has generously donated significant funding to the
FreeBSD project.BuffNETPacific
SolutionsSiemens AG
via Andre Albsmeier
andre.albsmeier@mchp.siemens.deChris Silva ras@interaccess.comHardware contributors:The following individuals and businesses have generously
contributed hardware for testing and device driver
development/support:BSDi for providing the Pentium P5-90 and
486/DX2-66 EISA/VL systems that are being used for our
development work, to say nothing of the network access and other
donations of hardware resources.Compaq
has donated a variety of Alpha systems to the FreeBSD
Project. Among the many generous donations are 4
AlphaStation DS10s, an AlphaServer DS20,
AlphaServer 2100s, an AlphaServer 4100, 8 500Mhz
Personal Workstations, 4 433Mhz Personal Workstations,
and more! These machines are used for release
engineering, package building, SMP development, and general
development on the Alpha architecture.TRW Financial Systems, Inc. provided 130 PCs, three 68 GB
file servers, twelve Ethernets, two routers and an ATM switch for
debugging the diskless code.Dermot McDonnell donated the Toshiba XM3401B CDROM drive
currently used in freefall.Chuck Robey chuckr@glue.umd.edu contributed
his floppy tape streamer for experimental work.Larry Altneu larry@ALR.COM, and &a.wilko;,
provided Wangtek and Archive QIC-02 tape drives in order to
improve the wt driver.Ernst Winter ewinter@lobo.muc.de contributed
a 2.88 MB floppy drive to the project. This will hopefully
increase the pressure for rewriting the floppy disk driver.
Tekram
Technologies sent one each of their DC-390, DC-390U
and DC-390F FAST and ULTRA SCSI host adapter cards for
regression testing of the NCR and AMD drivers with their cards.
They are also to be applauded for making driver sources for free
operating systems available from their FTP server .Larry M. Augustin contributed not only a
Symbios Sym8751S SCSI card, but also a set of data books,
including one about the forthcoming Sym53c895 chip with Ultra-2
and LVD support, and the latest programming manual with
information on how to safely use the advanced features of the
latest Symbios SCSI chips. Thanks a lot!Christoph Kukulies kuku@FreeBSD.org donated
an FX120 12 speed Mitsumi CDROM drive for IDE CDROM driver
development.Mike Tancsa mike@sentex.ca donated four various
ATM PCI cards in order to help increase support of these cards as
well as help support the development effort of the netatm ATM
stack.
Special contributors:BSDi (formerly Walnut Creek CDROM)
has donated almost more than we can say (see the 'About the FreeBSD Project'
section of the FreeBSD Handbook for more details).
In particular, we would like to thank them for the original
hardware used for freefall.FreeBSD.org, our primary
development machine, and for thud.FreeBSD.org, a testing and build
box. We are also indebted to them for funding various
contributors over the years and providing us with unrestricted
use of their T1 connection to the Internet.The interface
business GmbH, Dresden has been patiently supporting
&a.joerg; who has often preferred FreeBSD work over paid work, and
used to fall back to their (quite expensive) EUnet Internet
connection whenever his private connection became too slow or
flaky to work with it...Berkeley Software Design,
Inc. has contributed their DOS emulator code to the
remaining BSD world, which is used in the
doscmd command.The FreeBSD Core TeamThe 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):
&contrib.core;
Other &os; TeamsThe &os; project delegates certain individuals to work
on various teams according to project needs. The following
list contains the current information on those individuals and
their designated areas:
&contrib.staff;
The FreeBSD DevelopersThese are the people who have commit privileges and do the
engineering work on the FreeBSD source tree. All core team members are
also developers.(in alphabetical order by last name):
&contrib.committers;
The FreeBSD Documentation ProjectThe 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 Architect&a.nik;Handbook Editor&a.doc;FAQ Editor&a.doc;News Editor&a.jim;In the Press Editor&a.jkoshy;FreeBSD Really-Quick NewsLetter EditorChris Coleman chrisc@vmunix.comGallery Editor&a.phantom;Commercial Gallery Editor&a.josef;User Groups Editor&a.grog;FreeBSD &java; Project&a.patrick;LinuxDoc to DocBook conversion&a.nik;Who is Responsible for WhatDocumentation
Project Manager&a.nik;CVSup Mirror Site Coordinator&a.cvsup-master;which includes:&a.kuriyama; (responsible),&a.jdp; (advisor)FTP/WWW Mirror Site Coordinator&a.mirror-admin;which includes:&a.kuriyama;,&a.kensmith;Localization&a.ache;Postmaster&a.dhw;,&a.jmb;Release
Coordination&a.re; headed by &a.murray;Public Relations & Corporate LiaisonSeat openSecurity
Officers&a.security-officer; headed by &a.nectar;Source
Repository ManagersPrincipal: &a.peter;Assistants: &a.markm;, &a.joe;Website Management&a.www;Ports
Manager&a.portmgr;which includes:
- &a.knu;,&a.kris;,
- &a.lioux;,&a.marcus;,
- &a.sobomax;,
- &a.steve;,&a.will;,
+ &a.linimon;,
+ &a.eik;,
+ &a.krion;,&a.erwin; (secretary)Standards&a.wollman;XFree86 Project, Inc. Liaison&a.rich;GNATS
Administrators&a.ceri;&a.keramida;&a.linimon;Bugmeisters&a.ceri;&a.keramida;&a.linimon;Donations Liaison Office&a.donations;which includes:&a.mwlucas&a.nsayer&a.obrien&a.rwatson&a.trhodesCore Team Alumnicore teamThe following people were members of the FreeBSD core team during
the periods indicated. We thank them for their past efforts in the
service of the FreeBSD project.In rough chronological order:
&contrib.corealumni;
Development Team Alumnidevelopment teamThe following people were members of the FreeBSD development team
during the periods indicated. We thank them for their past efforts
in the service of the FreeBSD project.In rough chronological order:
&contrib.develalumni;
Derived Software ContributorsThis software was originally derived from William F. Jolitz's 386BSD
release 0.1, though almost none of the original 386BSD specific code
remains. This software has been essentially re-implemented from the
4.4BSD-Lite release provided by the Computer Science Research Group
(CSRG) at the University of California, Berkeley and associated academic
contributors.There are also portions of NetBSD and OpenBSD that have been
integrated into FreeBSD as well, and we would therefore like to thank
all the contributors to NetBSD and OpenBSD for their work.Additional FreeBSD Contributors(in alphabetical order by first name):
&contrib.additional;
386BSD Patch Kit Patch Contributors(in alphabetical order by first name):
&contrib.386bsd;
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
index 2d8f0f9f41..b1a5eab2c3 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
@@ -1,399 +1,396 @@
The &os; documentation engineering teamThe &os; documentation engineering team is made up of the
following unelected individuals:&a.murray;&a.kuriyama;&a.ru;&a.nik;The &os; port management teamThe &os; port management team is made up of the
following unelected individuals:&a.kris;
- &a.sobomax;
+ &a.will;
- &a.steve;
+ &a.marcus;
- &a.will;
+ &a.linimon;
- &a.knu;
+ &a.eik;
- &a.lioux;
+ &a.krion;
-
- &a.marcus;
- The &os; Donations TeamThe &os; Donations Liaison Team consists of the
following designated individuals:&a.mwlucas;&a.nsayer;&a.obrien;&a.trhodes;&a.wilko; (core team liaison)The &os; Technical Review BoardThe &os; Technical Review Board consists of the following
appointed individuals:&a.dfr;&a.jake;&a.jeff;&a.iedowse;&a.alc;&a.gallatin;&a.jhb;&a.peter;&a.imp;&a.sam;The &os; Security Team:The current security team in &os; consists of:&a.rwatson&a.bms;&a.cperciva;&a.des;&a.gshapiro;&a.guido;&a.imp;&a.julian;&a.nectar;&a.trhodes;Misc HatsCurrent &os; Bugmeisters and GNATS admins:&a.ceri;&a.keramida;&a.linimon;Current &os; security officer:&a.nectar;Current &os; security officer deputy&a.des;Current &os; core team secretary:&a.wilko;&os; Release Engineering TeamsPrimary &os; Release Engineering TeamThe delegated individuals make up the primary &os; release
engineering team:&a.jhb;&a.murray;&a.rwatson;&a.scottl;&a.steve;&a.kensmith;&a.hrs;Alpha Release EngineeringThe &os; Alpha release engineering team is made up of the
following delegated individuals:&a.jhb;&a.murray;&a.rwatson;&a.scottl;&a.wilko;IA-64 Release EngineeringThe IA-64 release engineering team is made up of the
following delegated individuals:&a.marcel;&a.peter;i386 Release EngineeringThe i386 release engineering team is made up of the
following delegated individuals:&a.jhb;&a.murray;&a.rwatson;&a.scottl;&a.hrs;PC98 Release EngineeringThe PC98 release engineering team is made up of the
following delegated individual:&a.nyan;Sparc64 Release EngineeringThe Sparc64 release engineering team is made up of
of the following delegated individuals:&a.jake;&a.murray;&a.jhb;&a.scottl;&a.phk;&a.tmm;&a.rwatson;&a.kensmith;