diff --git a/en/developers.sgml b/en/developers.sgml
index 9e5a59595a..78b827cd63 100644
--- a/en/developers.sgml
+++ b/en/developers.sgml
@@ -1,224 +1,224 @@
 <!--
 
 This document provides entities for developers listed by name on the
 FreeBSD web site.  Keeping this information in a central location
 allows multiple documents to use the abbreviated entities, and allows
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.133 2006/05/16 16:30:27 bmah Exp $
+$FreeBSD: www/en/developers.sgml,v 1.134 2006/05/17 15:22:01 bmah Exp $
 
 -->
 
 <!-- FreeBSD Contributors -->
 <!ENTITY a.ache "Andrey&nbsp;A.&nbsp;Chernov">
 <!ENTITY a.ade "Ade Lovett">
 <!ENTITY a.alc "Alan L. Cox">
 <!ENTITY a.alfred "Alfred Perlstein">
 <!ENTITY a.anholt "Eric Anholt">
 <!ENTITY a.andre "Andre&nbsp;Oppermann">
 <!ENTITY a.archie "Archie Cobbs">
 <!ENTITY a.ariff "Ariff Abdullah">
 <!ENTITY a.arr "Andrew Reiter">
 <!ENTITY a.asami "Satoshi Asami">
 <!ENTITY a.asmodai "Jeroen&nbsp;Ruigrok">
 <!ENTITY a.bde "Bruce&nbsp;Evans">
 <!ENTITY a.benno "Benno Rice">
 <!ENTITY a.billf "Bill Fumerola">
 <!ENTITY a.blackend "Marc Fonvieille">
 <!ENTITY a.bmah "Bruce A. Mah">
 <!ENTITY a.bmilekic "Bosko Milekic">
 <!ENTITY a.bms "Bruce M. Simpson">
 <!ENTITY a.brd "Brad Davis">
 <!ENTITY a.brian "Brian Somers">
 <!ENTITY a.brooks "Brooks Davis">
 <!ENTITY a.brueffer "Christian Brueffer">
 <!ENTITY a.bruno "Bruno Ducrot">
 <!ENTITY a.carvay "J. Vicente Carrasco">
 <!ENTITY a.ceri "Ceri Davies">
 <!ENTITY a.chern "Chern Lee">
 <!ENTITY a.chris "Chris Costello">
 <!ENTITY a.clement "Clement Laforet">
 <!ENTITY a.cognet "Olivier Houchard">
 <!ENTITY a.cp "Chuck Paterson">
 <!ENTITY a.cperciva "Colin Percival">
 <!ENTITY a.cracauer "Martin Cracauer">
 <!ENTITY a.csjp "Christian Peron">
 <!ENTITY a.dannyboy "Daniel Harris">
 <!ENTITY a.das "David Schultz">
 <!ENTITY a.davidc "Chad David">
 <!ENTITY a.davidxu "David Xu">
 <!ENTITY a.dd "Dima&nbsp;Dorfman">
 <!ENTITY a.dec "David&nbsp;E.&nbsp;Cross">
 <!ENTITY a.deischen "Daniel Eischen">
 <!ENTITY a.des "Dag-Erling Smorgrav">
 <!ENTITY a.dfr "Doug Rabson">
 <!ENTITY a.dillon "Matt Dillon">
 <!ENTITY a.dougb "Doug Barton">
 <!ENTITY a.dwhite "Doug White">
 <!ENTITY a.dwmalone "David Malone">
 <!ENTITY a.eik "Oliver Eikemeier">
 <!ENTITY a.eivind "Eivind Eklund">
 <!ENTITY a.emaste "Ed Maste">
 <!ENTITY a.emax "Maksim Yevmenkin">
 <!ENTITY a.erwin "Erwin Lansing">
 <!ENTITY a.fenner "Bill&nbsp;Fenner">
 <!ENTITY a.gad "Garance A Drosehn">
 <!ENTITY a.gallatin "Andrew Gallatin">
 <!ENTITY a.gibbs "Justin Gibbs">
 <!ENTITY a.glebius "Gleb Smirnoff">
 <!ENTITY a.gnn "George V. Neville-Neil">
 <!ENTITY a.gordon "Gordon Tetlow">
 <!ENTITY a.green "Brian Feldman">
 <!ENTITY a.grehan "Peter Grehan">
 <!ENTITY a.grog "Greg Lehey">
 <!ENTITY a.guido "Guido van Rooij">
 <!ENTITY a.harti "Harti Brandt">
 <!ENTITY a.hmp "Hiten Pandya">
 <!ENTITY a.hrs "Hiroki&nbsp;Sato">
 <!ENTITY a.hsu "Jeffrey Hsu">
 <!ENTITY a.iedowse "Ian Dowse">
 <!ENTITY a.imp "Warner Losh">
 <!ENTITY a.jake "Jake Burkholder">
 <!ENTITY a.jasone "Jason Evans">
 <!ENTITY a.jcamou "Jesus R. Camou">
 <!ENTITY a.jedgar "Chris D. Faulhaber">
 <!ENTITY a.jeff "Jeff Roberson">
 <!ENTITY a.jennifer "Jennifer Yang">
 <!ENTITY a.jesusr "Jesus Rodriguez">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jkh "Jordan Hubbard">
 <!ENTITY a.jkoshy "Joseph Koshy">
 <!ENTITY a.jlemon "Jonathan Lemon">
 <!ENTITY a.jmallett "Juli Mallett">
 <!ENTITY a.jmg "John-Mark Gurney">
 <!ENTITY a.joe "Josef Karthauser">
 <!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
 <!ENTITY a.joel "Joel Dahl">
 <!ENTITY a.julian "Julian Elischer">
 <!ENTITY a.jwd "John&nbsp;W.&nbsp;De&nbsp;Boskey">
 <!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
 <!ENTITY a.kan "Alexander Kabaev">
 <!ENTITY a.kbyanc "Kelly&nbsp;Yancey">
 <!ENTITY a.keichii "Michael&nbsp;C.&nbsp;Wu">
 <!ENTITY a.ken "Kenneth Merry">
 <!ENTITY a.kensmith "Ken Smith">
 <!ENTITY a.keramida "Giorgos&nbsp;Keramidas">
 <!ENTITY a.kmacy "Kip&nbsp;Macy">
 <!ENTITY a.knu "Akinori&nbsp;MUSHA">
 <!ENTITY a.krion "Kirill Ponomarew">
 <!ENTITY a.kris "Kris Kennaway">
 <!ENTITY a.kuriyama "Jun Kuriyama">
 <!ENTITY a.linimon "Mark Linimon">
 <!ENTITY a.lioux "Mario Sergio Fujikawa Ferreira">
 <!ENTITY a.luigi "Luigi Rizzo">
 <!ENTITY a.marcel "Marcel Moolenaar">
 <!ENTITY a.marcus "Joe Marcus Clarke">
 <!ENTITY a.marius "Marius Strobl">
 <!ENTITY a.markm "Mark&nbsp;Murray">
 <!ENTITY a.marks "Mark&nbsp;Santcroos">
 <!ENTITY a.mat "Mathieu Arnold">
 <!ENTITY a.matk "Mathew&nbsp;Kanner">
 <!ENTITY a.maxim "Maxim&nbsp;Konovalov">
 <!ENTITY a.mbr "Martin Blapp">
 <!ENTITY a.mckusick "Kirk McKusick">
 <!ENTITY a.mdodd "Matthew Dodd">
 <!ENTITY a.mike "Mike&nbsp;Barcroft">
 <!ENTITY a.mikeh "Mike&nbsp;Heffner">
 <!ENTITY a.mini "Jonathan&nbsp;Mini">
 <!ENTITY a.mkm "Kyle&nbsp;Martin">
 <!ENTITY a.mlaier "Max Laier">
 <!ENTITY a.mohans "Mohan&nbsp;Srinivasan">
 <!ENTITY a.mp "Mark Peek">
 <!ENTITY a.msmith "Mike Smith">
 <!ENTITY a.mtm "Mike Makonnen">
 <!ENTITY a.murray "Murray Stokely">
 <!ENTITY a.mux "Maxime Henrion">
 <!ENTITY a.mwlucas "Michael Lucas">
 <!ENTITY a.nectar "Jacques Vidrine">
 <!ENTITY a.netchild "Alexander Leidinger">
 <!ENTITY a.nik "Nik Clayton">
 <!ENTITY a.njl "Nate Lawson">
 <!ENTITY a.non "Noriaki&nbsp;Mitsunaga">
 <!ENTITY a.nsayer "Nick Sayer">
 <!ENTITY a.nyan "Takahashi Yoshihiro">
 <!ENTITY a.obrien "David O'Brien">
 <!ENTITY a.pav "Pav Lucistnik">
 <!ENTITY a.pavalos "Peter&nbsp;Avalos">
 <!ENTITY a.pb "Pierre&nbsp;Beyssac">
 <!ENTITY a.pdeuskar "Prafulla Deuskar">
 <!ENTITY a.peter "Peter Wemm">
 <!ENTITY a.phantom "Alexey&nbsp;Zelkin">
 <!ENTITY a.philip "Philip Paeps">
 <!ENTITY a.phk "Poul-Henning Kamp">
 <!ENTITY a.pjd "Pawel Jakub Dawidek">
 <!ENTITY a.ps "Paul Saab">
 <!ENTITY a.re "re@FreeBSD.org">
 <!ENTITY a.remko "Remko Lodder">
 <!ENTITY a.rik "Roman Kurakin">
 <!ENTITY a.rink "Rink Springer">
 <!ENTITY a.robert "Robert&nbsp;Drehmel">
 <!ENTITY a.ru "Ruslan Ermilov">
 <!ENTITY a.rushani "Hideyuki&nbsp;KURASHINA">
 <!ENTITY a.rwatson "Robert Watson">
 <!ENTITY a.roberto "Ollivier Robert">
 <!ENTITY a.rodrigc "Craig Rodrigues">
 <!ENTITY a.sam "Sam Leffler">
 <!ENTITY a.schweikh "Jens Schweikhardt">
 <!ENTITY a.scop "Ville Skytt&auml;">
 <!ENTITY a.scottl "Scott&nbsp;Long">
 <!ENTITY a.sheldonh "Sheldon&nbsp;Hearn">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. Nielsen">
 <!ENTITY a.sobomax "Maxim Sobolev">
 <!ENTITY a.sos "S&oslash;ren Schmidt">
 <!ENTITY a.ssouhlal "Suleiman Souhlal">
 <!ENTITY a.stefanf "Stefan Farfeleder">
 <!ENTITY a.steve "Steve Price">
 <!ENTITY a.takawata "Takanori Watanabe">
 <!ENTITY a.tanimura "Seigo Tanimura">
 <!ENTITY a.tegge "Tor Egge">
 <!ENTITY a.ticso "Bernd Walter">
 <!ENTITY a.tjr "Tim&nbsp;J.&nbsp;Robbins">
 <!ENTITY a.tmm "Thomas Moestl">
 <!ENTITY a.trevor "Trevor Johnson">
 <!ENTITY a.trhodes "Tom Rhodes">
 <!ENTITY a.truckman "Don Lewis">
 <!ENTITY a.ume "Hajimu UMEMOTO">
 <!ENTITY a.ups "Stephan Uphoff">
 <!ENTITY a.wes "Wes&nbsp;Peters">
 <!ENTITY a.wilko "Wilko Bulte">
 <!ENTITY a.will "Will Andrews">
 <!ENTITY a.wollman "Garrett&nbsp;Wollman">
 <!ENTITY a.wpaul "Bill Paul">
 <!ENTITY a.yar "Yar Tikhiy">
 
 <!-- Below we list the various hats.  This is used in internal/staff.sgml
 so that we may keep a list of hat owners and modify only this file. -->
 
 <!-- FreeBSD Bugmeister -->
 <!ENTITY a.bugmeister '&a.ceri;, &a.linimon;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng '&a.nik;, &a.murray;, &a.ru;, &a.hrs;, &a.blackend;'>
 
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY a.donations '&a.brueffer;, &a.mwlucas;, &a.nsayer;, &a.obrien;, &a.rwatson;, &a.trhodes;, &a.wilko;'>
 
 <!-- FreeBSD Ports Manager Team -->
 <!ENTITY a.portmgr '&a.kris;, &a.marcus;, &a.linimon;, &a.clement;, &a.krion;, &a.erwin;'>
 
 <!-- FreeBSD Release Engineering Teams -->
-<!ENTITY a.re.members '&a.murray;, &a.rwatson;, &a.scottl;, &a.dwhite;, &a.kensmith;, &a.hrs;, &a.mux;, &a.bmah;'>
-<!ENTITY a.re-alpha '&a.murray;, &a.rwatson;, &a.scottl;, &a.wilko;'>
+<!ENTITY a.re.members '&a.murray;, &a.rwatson;, &a.dwhite;, &a.kensmith;, &a.hrs;, &a.mux;, &a.bmah;'>
+<!ENTITY a.re-alpha '&a.murray;, &a.rwatson;, &a.wilko;'>
 <!ENTITY a.re-amd64 '&a.obrien;'>
 <!ENTITY a.re-ia64 '&a.marcel;'>
-<!ENTITY a.re-i386 '&a.murray;, &a.rwatson;, &a.scottl;'>
+<!ENTITY a.re-i386 '&a.murray;, &a.rwatson;'>
 <!ENTITY a.re-pc98 '&a.nyan;'>
 <!ENTITY a.re-powerpc '&a.grehan;'>
-<!ENTITY a.re-sparc64 '&a.jake;, &a.murray;, &a.phk;, &a.rwatson;, &a.scottl;, &a.tmm;, &a.kensmith;, &a.obrien;'>
+<!ENTITY a.re-sparc64 '&a.jake;, &a.murray;, &a.phk;, &a.rwatson;, &a.tmm;, &a.kensmith;, &a.obrien;'>
 
 <!-- FreeBSD Security Officer -->
 <!ENTITY a.so '&a.cperciva;'>
 
 <!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.nectar;, &a.rwatson;'>