diff --git a/en/donations/wantlist.sgml b/en/donations/wantlist.sgml
index 5b2eef1753..753ad91ff4 100644
--- a/en/donations/wantlist.sgml
+++ b/en/donations/wantlist.sgml
@@ -1,313 +1,305 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.29 2002/10/15 17:49:03 sobomax Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.30 2002/10/15 18:53:55 mdodd Exp $">
 <!ENTITY title "FreeBSD Developers Want List">
 <!ENTITY email 'donations'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <html>
   &header;
 
     <p>This page lists various developer hardware needs.  If you are
       interested in supporting the FreeBSD Project, you might consider
       donating some piece of hardware on this list to the Project.</p>
 
     <p>We provide the FreeBSD username of the developer who needs a
       resource, the country they are in (for shipping purposes), the
       equipment they desire, and the use to which that equipment will
       be put.</p>
 
     <p>For information on tax deductions and process, please see the
       information on the main <a href="index.html#donating">FreeBSD
       Donation Liason office</a> page.</p>
 
     <p>If you would like to donate something on this list, please
       contact donations@FreeBSD.org.</p>
 
     <p>On a general note, we need a variety of Sparc 64 machines for
       testing and improving our new Sparc port.  Even small, old (or
       new!) Sparc 64 machines are perfectly usable.  No matter which
       country you're in, we almost certainly have someone local who
       could use it.  We could specifically use 1U rack-mounted Sparcs
       (such as E220R, E420R, Fire V100, Fire V120, or Netra T1 AC200)
       for our development and package-building clusters in the
       USA.</p>
 
     <table border=3>
       <tr>
 	<th>Developer ID</th>
 	<th>Developer Country</th>
         <th>Equipment Desired</th>
 	<th>Equipment Use</th>
       </tr>
 
       <tr>
 	<td>anholt</td>
 	<td>USA</td>
 	<td>reasonably fast PCI Alpha system</td>
 	<td>X and DRI support on Alpha</td>
       </tr>
 
       <tr>
 	<td>anholt</td>
 	<td>USA</td>
 	<td>KVM switch that looks good at high resolution</td>
 	<td>X and DRI development</td>
       </tr>
 
       <tr>
 	<td>mdodd</td>
 	<td>USA</td>
 	<td>Sony CDU31 (not 311) or CDU33[A] CDROM drive.</td>
 	<td>scd(4) maintenance</td>
       </tr>
 
       <tr>
         <td>gioria</td>
         <td>France</td>
         <td>Pentium 3 or 4, 256MB RAM, at least 30GB of disk, 100MB
 	  Fast-Ehernet NIC. If possible DDS3/4 tape drive for backup.
 	  </td>
         <td>Replacing the old and shared www.FreeBSD-fr.ORG server by
 	  a dedicated, new machine.</td>
       </tr>
 
       <tr>
 	<td>imp</td>
 	<td>USA</td>
 	<td>Pentium EISA system</td>
 	<td>improve and modernize EISA support</td>
       </tr>
 
       <tr>
 	<td>imp</td>
 	<td>USA</td>
 	<td>EISA-based pccard hardware</td>
 	<td>Make EISA pccard driver work</td>
       </tr>
 
       <tr>
 	<td>imp</td>
 	<td>USA</td>
 	<td>sbus-based pccard hardware</td>
 	<td>Make sbus pccard driver work</td>
       </tr>
 
       <tr>
 	<td>imp</td>
 	<td>USA</td>
 	<td>sparc64 machine with PCI and sbus slots</td>
 	<td>make pccard/cardbus work</td>
       </tr>
 
       <tr>
 	<td>imp</td>
 	<td>USA</td>
 	<td>3Com Xjack wireless card</td>
 	<td>make driver work</td>
       </tr>
 
       <tr>
 	<td>jake</td>
 	<td>Canada</td>
 	<td>various newer PCI network cards (fxp, xl, dc drivers)</td>
 	<td>Sparc64 driver support</td>
       </tr>
 
       <tr>
 	<td>jake</td>
 	<td>Canada</td>
 	<td>2 450MHz UltraSPARC II CPUs</td>
 	<td>Faster sparc64 test machine</td>
       </tr>
 
       <tr>
 	<td>jake</td>
 	<td>Canada</td>
 	<td>Sun server or workstation with UltraSPARCIII CPUs, Blade
 	  1000, Blade 2000, V280R, V480 or V880, preferably with 2
 	  CPUs</td>
 	<td>Sparc64 UltraSPARCIII support</td>
       </tr>
 
       <tr>
         <td>jesper</td>
         <td>Denmark</td>
         <td>4 pieces of 512 MB PC100 or PC133 SDRAM memory</td>
         <td>Memory upgrade for ftp.FreeBSD.org</td>
       </tr>
 
       <tr>
         <td>jlemon</td>
         <td>USA, Wisconsin</td>
         <td>APC MasterSwitch (or equivalent)</td>
         <td>Remote power management for multiple development machines</td>
       </tr>
 
       <tr>
 	<td>jmallett</td>
 	<td>USA, Kansas</td>
 	<td>small, headless, low-end Sparc 64 or Alpha system</td>
 	<td>Cross-platform development</td>
       </tr>
 
       <tr>
         <td>kris</td>
         <td>USA</td>
         <td>DDS-3/DDS-4 tape drive, 4-way KVM switch</td>
         <td>Make my computer lab more usable for hacking</td>
       </tr>
 
       <tr>
 	<td>markm</td>
 	<td>Cambridge, UK</td>
 	<td>Flexelint v8. (www.gimpel.com)</td>
 	<td>(Semi-)automated code cleaning and cross-platform compiler needs
           cleaning.</td>
       </tr>
 
       <tr>
 	<td>markm</td>
 	<td>Cambridge, UK</td>
 	<td>A modest but working Alpha or Sparc64</td>
 	<td>Cross-platform testing.</td>
       </tr>
 
       <tr>
 	<td>nsouch</td>
 	<td>France</td>
 	<td>Mach64 and/or Matrox PCI graphic cards</td>
 	<td>www.kgi-project.org development for FreeBSD</td>
       </tr>
 
       <tr>
 	<td>matusita</td>
 	<td>Japan</td>
 	<td>2-3 build machines:Pentium4 2GHz+,20GB+ ATA66+
 	  HDD,256MB+RAM, 100base-TX NIC,serial, etc.</td>
 	<td>rebuild dying snapshots.jp.FreeBSD.org</td>
       </tr>
 
       <tr>
 	<td>matusita</td>
 	<td>Japan</td>
 	<td>FTP server:Pentium3/Celeron 1GHz+,10GB+ ATA66+ HDD,100GB+
 	  storage (RAID0+1 desirable),256MB+RAM, 100base-TX
 	  NIC,serial, etc.</td>
 	<td>rebuild dying snapshots.jp.FreeBSD.org</td>
       </tr>
 
       <tr>
 	<td>mini</td>
 	<td>USA (west coast)</td>
 	<td>multi-processor x86 machine</td>
 	<td>For work on SMP KSE</td>
       </tr>
 
       <tr>
         <td>murray</td>
         <td>USA</td>
         <td>2Ghz+ Pentium 4 or Athlon, 512MB RAM, 20GB+ space, 100MB
           NIC</td>
         <td>Faster i386 build machine for FreeBSD releases.</td>
       </tr>
 
       <tr>
         <td>netchild</td>
         <td>Germany</td>
         <td>Pentium 4, <i>enough</i> RAM (256MB or more, our official port
           build machine has 1GB) and harddisk space (official port build
           machine: 5x36GB and 1x18GB), 100MB NIC. No graphic card is needed
           if the BIOS is accessible from the serial console. Nice to have:
           some hardware to make backups.</td>
          <td>Build and test P4 optimized packages with Intels C/C++
            compiler.</td>
       </tr>
 
       <tr>
         <td>netchild</td>
         <td>Germany</td>
         <td>A commercial license for the Intel C/C++ compiler for
           Linux (see <a
           href="http://www.intel.com/software/products/compilers/c60l/pricelist.htm">Intel's
           pricelist</a>).</td>
         <td>The non-commercial license I have doesn't allows me to
           make binaries available for download, a commercial license
           did not have this restriction so I can make icc compiled
           packages available for download (see also my above entry for
           a build/test machine).</td>
       </tr>
 
       <tr>
 	<td>njl</td>
 	<td>USA</td>
 	<td>dual-bus Adaptec HBA SCSI card, model 39160 or 3940U</td>
 	<td>SCSI support</td>
       </tr>
 
       <tr>
 	<td>ru</td>
 	<td>Ukraine</td>
 	<td>400MHz+ Celeron laptop or better, or modest desktop system</td>
 	<td>work on FreeBSD at home</td>
       </tr>
 
-      <tr>
-	<td>sobomax</td>
-	<td>Ukraine</td>
-	<td>64MB or more EDO SODIMM module compatible with Compaq Armada
-	  7792DMT notebook</td>
-	<td>Upgrade notebook used as primary box for FreeBSD development.</td>
-      </tr>
-
       <tr>
 	<td>sos</td>
 	<td>Denmark</td>
 	<td>Serial ATA hardware: disks, controllers (including docs),
 	  cables, Serial ATA-ATA converters.</td>
 	<td>Keep ATA support up to date.</td>
       </tr>
 
       <tr>
 	<td>thomas</td>
 	<td>France</td>
 	<td>UDMA controller, ATAPI floppy drive, ATAPI tape drive</td>
 	<td>Ensure these ATAPI devices work with ATAPI/CAM with the
 	  same level of functionality currently available with the
 	  afd/ast drivers.</td>
       </tr>
 
       <tr>
 	<td>wilko</td>
 	<td>the Netherlands</td>
 	<td>memory for a AlphaStation 500/266. 64 MB or better</td>
 	<td>Alpha platform development</td>
       </tr>
 
       <tr>
 	<td>wilko</td>
 	<td>the Netherlands</td>
 	<td>PCI multiport serial card, 4 ports or more, or USB/serial
 	  adapters</td>
 	<td>serial consoles for Alpha development machines</td>
       </tr>
 
       <tr>
 	<td>wilko</td>
 	<td>the Netherlands</td>
 	<td>multi-processor system</td>
 	<td>SMP development</td>
       </tr>
 
       <tr>
 	<td>will</td>
 	<td>Indiana, USA</td>
 	<td>A working FreeBSD/alpha machine (preferably a 21164 or faster)</td>
 	<td>Better KDE/FreeBSD support on this architecture.</td>
       </tr>
 
     </table>
 
   &footer;
   </body>
 </html>

Developer ID	Developer Country	Equipment Desired	Equipment Use
anholt	USA	reasonably fast PCI Alpha system	X and DRI support on Alpha
anholt	USA	KVM switch that looks good at high resolution	X and DRI development
mdodd	USA	Sony CDU31 (not 311) or CDU33[A] CDROM drive.	scd(4) maintenance
gioria	France	Pentium 3 or 4, 256MB RAM, at least 30GB of disk, 100MB Fast-Ehernet NIC. If possible DDS3/4 tape drive for backup.	Replacing the old and shared www.FreeBSD-fr.ORG server by a dedicated, new machine.
imp	USA	Pentium EISA system	improve and modernize EISA support
imp	USA	EISA-based pccard hardware	Make EISA pccard driver work
imp	USA	sbus-based pccard hardware	Make sbus pccard driver work
imp	USA	sparc64 machine with PCI and sbus slots	make pccard/cardbus work
imp	USA	3Com Xjack wireless card	make driver work
jake	Canada	various newer PCI network cards (fxp, xl, dc drivers)	Sparc64 driver support
jake	Canada	2 450MHz UltraSPARC II CPUs	Faster sparc64 test machine
jake	Canada	Sun server or workstation with UltraSPARCIII CPUs, Blade 1000, Blade 2000, V280R, V480 or V880, preferably with 2 CPUs	Sparc64 UltraSPARCIII support
jesper	Denmark	4 pieces of 512 MB PC100 or PC133 SDRAM memory	Memory upgrade for ftp.FreeBSD.org
jlemon	USA, Wisconsin	APC MasterSwitch (or equivalent)	Remote power management for multiple development machines
jmallett	USA, Kansas	small, headless, low-end Sparc 64 or Alpha system	Cross-platform development
kris	USA	DDS-3/DDS-4 tape drive, 4-way KVM switch	Make my computer lab more usable for hacking
markm	Cambridge, UK	Flexelint v8. (www.gimpel.com)	(Semi-)automated code cleaning and cross-platform compiler needs cleaning.
markm	Cambridge, UK	A modest but working Alpha or Sparc64	Cross-platform testing.
nsouch	France	Mach64 and/or Matrox PCI graphic cards	www.kgi-project.org development for FreeBSD
matusita	Japan	2-3 build machines:Pentium4 2GHz+,20GB+ ATA66+ HDD,256MB+RAM, 100base-TX NIC,serial, etc.	rebuild dying snapshots.jp.FreeBSD.org
matusita	Japan	FTP server:Pentium3/Celeron 1GHz+,10GB+ ATA66+ HDD,100GB+ storage (RAID0+1 desirable),256MB+RAM, 100base-TX NIC,serial, etc.	rebuild dying snapshots.jp.FreeBSD.org
mini	USA (west coast)	multi-processor x86 machine	For work on SMP KSE
murray	USA	2Ghz+ Pentium 4 or Athlon, 512MB RAM, 20GB+ space, 100MB NIC	Faster i386 build machine for FreeBSD releases.
netchild	Germany	Pentium 4, enough RAM (256MB or more, our official port build machine has 1GB) and harddisk space (official port build machine: 5x36GB and 1x18GB), 100MB NIC. No graphic card is needed if the BIOS is accessible from the serial console. Nice to have: some hardware to make backups.	Build and test P4 optimized packages with Intels C/C++ compiler.
netchild	Germany	A commercial license for the Intel C/C++ compiler for Linux (see Intel's pricelist).	The non-commercial license I have doesn't allows me to make binaries available for download, a commercial license did not have this restriction so I can make icc compiled packages available for download (see also my above entry for a build/test machine).
njl	USA	dual-bus Adaptec HBA SCSI card, model 39160 or 3940U	SCSI support
ru	Ukraine	400MHz+ Celeron laptop or better, or modest desktop system	work on FreeBSD at home
sobomax	Ukraine	64MB or more EDO SODIMM module compatible with Compaq Armada - 7792DMT notebook	Upgrade notebook used as primary box for FreeBSD development.
sos	Denmark	Serial ATA hardware: disks, controllers (including docs), cables, Serial ATA-ATA converters.	Keep ATA support up to date.
thomas	France	UDMA controller, ATAPI floppy drive, ATAPI tape drive	Ensure these ATAPI devices work with ATAPI/CAM with the same level of functionality currently available with the afd/ast drivers.
wilko	the Netherlands	memory for a AlphaStation 500/266. 64 MB or better	Alpha platform development
wilko	the Netherlands	PCI multiport serial card, 4 ports or more, or USB/serial adapters	serial consoles for Alpha development machines
wilko	the Netherlands	multi-processor system	SMP development
will	Indiana, USA	A working FreeBSD/alpha machine (preferably a 21164 or faster)	Better KDE/FreeBSD support on this architecture.