diff --git a/en/developers.sgml b/en/developers.sgml
index 8f78f6b2e2..24ea43e0fb 100644
--- a/en/developers.sgml
+++ b/en/developers.sgml
@@ -1,182 +1,182 @@
 <!--
 
 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.82 2004/08/04 02:32:13 scottl Exp $
+$FreeBSD: www/en/developers.sgml,v 1.83 2004/08/20 04:01:01 rwatson Exp $
 
 -->
 
 <!-- FreeBSD Contributers -->
 <!ENTITY a.ade "Ade Lovett">
 <!ENTITY a.ache "Andrey&nbsp;A.&nbsp;Chernov">
 <!ENTITY a.alc "Alan L. Cox">
 <!ENTITY a.alfred "Alfred Perlstein">
 <!ENTITY a.anholt "Eric Anholt">
 <!ENTITY a.archie "Archie Cobbs">
 <!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.brian "Brian Somers">
 <!ENTITY a.brooks "Brooks Davis">
 <!ENTITY a.brueffer "Christian Brueffer">
 <!ENTITY a.ceri "Ceri Davies">
 <!ENTITY a.chern "Chern Lee">
 <!ENTITY a.chris "Chris Costello">
 <!ENTITY a.cognet "Olivier Houchard">
 <!ENTITY a.cp "Chuck Paterson">
 <!ENTITY a.das "David Schultz">
 <!ENTITY a.dannyboy "Daniel Harris">
 <!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.eik "Oliver Eikemeier">
 <!ENTITY a.eivind "Eivind Eklund">
 <!ENTITY a.fenner "Bill&nbsp;Fenner">
 <!ENTITY a.gad "Garance A Drosehn">
 <!ENTITY a.gallatin "Andrew Gallatin">
 <!ENTITY a.gibbs "Justin Gibbs">
 <!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.jedgar "Chris D. Faulhaber">
 <!ENTITY a.jeff "Jeff Roberson">
 <!ENTITY a.jennifer "Jennifer Yang">
 <!ENTITY a.jhb "John Baldwin">
 <!ENTITY a.jlemon "Jonathan Lemon">
 <!ENTITY a.jmallett "Juli Mallett">
 <!ENTITY a.joe "Josef Karthauser">
 <!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
 <!ENTITY a.jmg "John-Mark Gurney">
 <!ENTITY a.julian "Julian Elischer">
 <!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.knu "Akinori&nbsp;MUSHA">
 <!ENTITY a.kris "Kris Kennaway">
 <!ENTITY a.kuriyama "Jun Kuriyama">
 <!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.markm "Mark&nbsp;Murray">
 <!ENTITY a.marks "Mark&nbsp;Santcroos">
 <!ENTITY a.maxim "Maxim&nbsp;Konovalov">
 <!ENTITY a.mbr "Martin Blapp">
 <!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.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.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.pavalos "Peter&nbsp;Avalos">
 <!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.re "re@FreeBSD.org">
 <!ENTITY a.rik "Roman Kurakin">
 <!ENTITY a.robert "Robert&nbsp;Drehmel">
 <!ENTITY a.ru "Ruslan Ermilov">
 <!ENTITY a.rushani "Hideyuki&nbsp;KURASHINA">
 <!ENTITY a.rwatson "Robert Watson">
 <!ENTITY a.sam "Sam Leffler">
 <!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 Nielsen">
+<!ENTITY a.simon "Simon L. Nielsen">
 <!ENTITY a.sobomax "Maxim Sobolev">
 <!ENTITY a.sos "S&oslash;ren Schmidt">
 <!ENTITY a.steve "Steve Price">
 <!ENTITY a.stefanf "Stefan Farfeleder">
 <!ENTITY a.schweikh "Jens Schweikhardt">
 <!ENTITY a.tanimura "Seigo Tanimura">
 <!ENTITY a.tegge "Tor Egge">
 <!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.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">
 
 <!-- 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.keramida;, &a.linimon;'>
 
 <!-- FreeBSD Doc Engineering Team -->
 <!ENTITY a.doceng '&a.nik;, &a.murray;, &a.ru;, &a.kuriyama;, &a.hrs;, &a.blackend;'>
 
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY a.donations '&a.mwlucas;, &a.nsayer;, &a.obrien;, &a.rwatson;, &a.trhodes;'>
 
 <!-- FreeBSD Ports Manager Team -->
 <!ENTITY a.portmgr '&a.asami;, &a.kris;, &a.sobomax;, &a.steve;, &a.will;, &a.knu;, &a.lioux;, &a.marcus;'>
 
 <!-- FreeBSD Release Engineering Teams -->
 <!ENTITY a.re.members '&a.jhb;, &a.murray;, &a.rwatson;, &a.scottl;, &a.steve;, &a.kensmith;, &a.hrs;'>
 <!ENTITY a.re-alpha '&a.jhb;, &a.murray;, &a.rwatson;, &a.scottl;, &a.wilko;'>
 <!ENTITY a.re-ia64 '&a.marcel;, &a.peter;'>
 <!ENTITY a.re-i386 '&a.jhb;, &a.murray;, &a.rwatson;, &a.scottl;'>
 <!ENTITY a.re-pc98 '&a.nyan;'>
 <!ENTITY a.re-sparc64 '&a.jake;, &a.jhb;, &a.murray;, &a.phk;, &a.rwatson;, &a.scottl;, &a.tmm;'>
 
 <!-- FreeBSD Security Officer -->
 <!ENTITY a.so '&a.nectar;'>
 
 <!ENTITY a.so-team '&a.kris;, &a.guido;, &a.wes;, &a.dannyboy;, &a.des;, &a.billf;, &a.trevor;, &a.rwatson;, &a.imp;, &a.jedgar;'>
 
 <!-- FreeBSD Technical Review Board -->
 <!ENTITY a.trb '&a.dfr;, &a.jake;, &a.jeff;, &a.iedowse;, &a.alc;, &a.gallatin;, &a.jhb;, &a.peter;, &a.imp;, &a.sam;'>