diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
index 6c21fb2f84..3c1b57790d 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
@@ -1,359 +1,355 @@
 <!-- $FreeBSD$ -->
 
     <sect2>
       <title>The &os; Documentation Engineering Team</title>
 
       <para>The &os; documentation engineering team is made up of the
 	following unelected individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.nik;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.ru;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.blackend;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.hrs;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>The &os; Port Management Team</title>
 
       <para>The &os; port management team is made up of the
 	following unelected individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.marcus;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.clement;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.erwin;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.linimon;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kris;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.krion;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
 
     <sect2>
       <title>The &os; Donations Team</title>
 
       <para>The &os; donations liaison team is made up of the
 	following designated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko; (core team liaison)</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.brueffer;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.mwlucas;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.trhodes;</para>
 	</listitem>
 
-	<listitem>
-	  <para>&a.nsayer;</para>
-	</listitem>
-
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2 id="staff-secteam">
       <title>The &os; Security Team</title>
 
       <para>The &os; security team is made up of the following
 	designated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.remko;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.simon;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.cperciva;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.csjp;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.guido;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.des;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.nectar;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
 
     <sect2>
       <title>Misc Hats</title>
 
       <para>The &os; Bugmeisters and <acronym>GNATS</acronym> admins:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.ceri;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.linimon;</para>
 	</listitem>
       </itemizedlist>
 
       <para>The &os; security officer:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.cperciva;</para>
 	</listitem>
       </itemizedlist>
 
       <para>The &os; security officer deputy:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.simon;</para>
 	</listitem>
       </itemizedlist>
 
       <para>The &os; core team secretary:</para>
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko;</para>
 	</listitem>
       </itemizedlist>
 
     </sect2>
   </sect1>
 
   <sect1 id="staff-re">
     <title>&os; Release Engineering Teams</title>
 
     <sect2>
       <title>Primary &os; Release Engineering Team</title>
 
       <para>The primary release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.hrs;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kensmith;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.dwhite;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>Alpha Release Engineering Team</title>
 
       <para>The Alpha release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.wilko;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>AMD64 Release Engineering Team</title>
 
       <para>The AMD64 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>IA-64 Release Engineering Team</title>
 
       <para>The IA-64 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.marcel;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>i386 Release Engineering Team</title>
 
       <para>The i386 release engineering team is made up of the
 	following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>PC98 Release Engineering Team</title>
 
       <para>The PC98 release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.nyan;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>PowerPC Release Engineering Team</title>
 
       <para>The PowerPC release engineering team is made up of the
 	following delegated individual:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.grehan;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2>
       <title>Sparc64 Release Engineering Team</title>
 
       <para>The Sparc64 release engineering team is made up of
 	the following delegated individuals:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>&a.jake;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.phk;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.scottl;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.tmm;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.obrien;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.kensmith;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.murray;</para>
 	</listitem>
 
 	<listitem>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </itemizedlist>
     </sect2>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.who.sgml b/en_US.ISO8859-1/articles/contributors/contrib.who.sgml
index e6e45323fd..ef8a4dca31 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.who.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.who.sgml
@@ -1,184 +1,183 @@
 <!-- $FreeBSD$ -->
 
     <variablelist>
       <varlistentry>
 	<term><ulink
 	    url="&url.base;/docproj/index.html">Documentation
 	    Project Manager</ulink></term>
 
 	<listitem>
 	  <para>&a.doceng;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>CVSup Mirror Site Coordinator</term>
 
 	<listitem>
 	  <para>&a.cvsup-master;</para>
 
 	  <para>which includes:</para>
 
 	  <para>&a.kuriyama; (responsible),</para>
 	  <para>&a.jdp; (advisor)</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>FTP/WWW Mirror Site Coordinator</term>
 
 	<listitem>
 	  <para>&a.mirror-admin;</para>
 
 	  <para>which includes:</para>
 
 	  <para>&a.kuriyama;,</para>
 	  <para>&a.kensmith;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Localization</term>
 
 	<listitem>
 	  <para>&a.ache;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Postmaster</term>
 
 	<listitem>
 	  <para><hostid role="domainname">FreeBSD.org</hostid> Postmaster
 	    team <email>postmaster@FreeBSD.org</email>, which includes:</para>
 	  <para>David Wolfskill</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.articles.releng;/index.html">Release
 		Coordination</ulink></term>
 
 	<listitem>
 	  <para>&a.re; headed by &a.scottl;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Public Relations &amp; Corporate Liaison</term>
 
 	<listitem>
 	  <para>Seat open</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.base;/security/index.html">Security
 	    Officers</ulink></term>
 
 	<listitem>
 	  <para>&a.security-officer; headed by &a.cperciva;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.base;/support.html#cvs">Source
 	    Repository Managers</ulink></term>
 
 	<listitem>
 	  <para>Principal: &a.peter;</para>
 
 	  <para>Assistants: &a.markm;, &a.joe;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Perforce Source Repository Managers</term>
 
 	<listitem>
 	  <para>&a.perforce-admin;</para>
 
 	  <para>which includes:</para>
 
 	  <para>&a.peter;</para>
 	  <para>&a.gordon;</para>
 	  <para>&a.kensmith;</para>
 	  <para>&a.dhw;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Website Management</term>
 
 	<listitem>
 	  <para>&a.www;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.base;/ports/index.html">Ports
 	    Management Team</ulink></term>
 
 	<listitem>
 	  <para>&a.portmgr;</para>
 
 	  <para>which includes:</para>
 
 	  <para>&a.kris;,</para>
 	  <para>&a.clement;,</para>
 	  <para>&a.marcus;,</para>
 	  <para>&a.linimon;,</para>
 	  <para>&a.krion;,</para>
 	  <para>&a.erwin;</para>
 
 	  <para>Secretary: &a.portmgr-secretary; (currently held by
 	    &a.erwin;)</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Standards</term>
 
 	<listitem>
 	  <para>&a.wollman;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.base;/support.html#gnats">GNATS
 	    Administrators</ulink></term>
 
 	<listitem>
 	  <para>&a.ceri;</para>
 	  <para>&a.linimon;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>Bugmeisters</term>
 
 	<listitem>
 	  <para>&a.ceri;</para>
 	  <para>&a.linimon;</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><ulink url="&url.base;/donations/index.html">Donations Liaison Office</ulink></term>
 
 	<listitem>
 	  <para>&a.donations;</para>
 
 	  <para>which includes:</para>
 
 	  <para>&a.wilko; (core team liaison)</para>
 	  <para>&a.brueffer;</para>
 	  <para>&a.mwlucas;</para>
 	  <para>&a.obrien;</para>
 	  <para>&a.trhodes;</para>
-	  <para>&a.nsayer;</para>
 	  <para>&a.rwatson;</para>
 	</listitem>
       </varlistentry>
 
     </variablelist>