Updated (mostly) to current situation. A few other small changes.

CVS version numbers

english/donations.wml: 1.18 -> 1.19

1 files changed, 78 insertions, 41 deletions

diff --git a/english/donations.wml b/english/donations.wml
index 02c34d9739a..687fe486f67 100644
--- a/english/donations.wml
+++ b/english/donations.wml
@@ -1,8 +1,8 @@
 #use wml::debian::template title="Donations to Software in the Public Interest"
 
 <UL>
-<LI><A href="#money_donations">Donations of money</A><BR>
-<LI><A href="#equipment_donations">Donations of equipment and services</A><BR>
+  <LI><A href="#money_donations">Donations of money</A>
+  <LI><A href="#equipment_donations">Donations of equipment and services</A>
 </UL>
 
 <H2><A name="money_donations">Donations of money</A></H2>
@@ -27,9 +27,9 @@ of their profit to help make Debian GNU/Linux the best OS
 it can be.
 
 <p>If you would like to make a monetary donation to Debian, see the
-<a href="http://www.spi-inc.org/donations.html">SPI donation page</a>. Make sure
-to specify that the money is intended for Debian. Since Debian is a
-non-profit organization we can issue receipts for tax purposes.
+<a href="http://www.spi-inc.org/donations.html">SPI donation page</a>.
+Make sure to specify that the money is intended for Debian. Since SPI
+is a non-profit organization we can issue receipts for tax purposes.
 
 <H2><A name="equipment_donations">Donations of equipment and services</A></H2>
 
@@ -43,59 +43,96 @@ controllers, network cards, etc) lying around, please consider donating them to
 Debian. Contact the 
 <A href="mailto:spi-treasurer@debian.org">SPI treasurer</A> for details.
 
+<HR>
+
 <H3>The following is a list of the organizations that have donated
 equipment to Debian:</H3>
 <UL>
-<LI><A href="http://www.novare.net/">Novare International</A>
-    donated the master system and the machine used as listserver for Debian.
-<LI><A href="http://www.varesearch.com/">VA Linux Systems</A>
+  <LI><A href="http://www.novare.net/">Novare International</A> (nowadays
+    <a href="http://www.brainfood.com/">Brainfood</a>)
+# master
+    donated the master system (used for BTS, mail, and other things) and
+# murphy
+    the machine used as listserver for Debian.
+  <LI><A href="http://www.varesearch.com/">VA Linux Systems</A>
+# va
     donated <A href="http://www.debian.org/">www.debian.org</A>.
-<LI><A HREF="http://www.linux-hw.com/">Linux Hardware Solutions</A> provided
-	the server that runs ftp.debian.org.
-<LI>LinuxPPC has donated an 18G hard disk
-<LI>Compaq has donated a Alpha which is being used to port debian to that
-    architecture.
-<LI>The Concorde Group has donated a Sparc Station 10 which is being used
-	to port Debian to the sparc.
+  <LI><A HREF="http://www.linux-hw.com/">Linux Hardware Solutions</A> provided
+    the server that ran ftp.debian.org.
+  <LI><a href="http://www.linuxppc.org/">LinuxPPC</a> has donated an 18G hard
+    disk
+  <LI><a href="http://www.compaq.com/">Compaq</a> has donated an Alpha
+# faure
+    system which is being used to port Debian to that architecture.
+  <LI>The Concorde Group has donated a Sparc Station 10 which is being used
+# kubrick
+    to port Debian to the SPARC architecture.
+  <LI><a href="http://www.kachinatech.com/">Kachina Technologies, Inc.</a>
+# xia0?.kachinatech.com
+    provided one SPARC machine and two UltraSPARC machines used to port
+    Debian to the SPARC architecture.
+  <LI><a href="http://www.above.net/">AboveNet Communications, Inc.</a>
+# samosa
+    provided server and bandwidth for
+    <a href="http://archive.debian.org/">archive.debian.org</a>.
+  <LI><a href="http://www.alpha-processor.com/">Alpha Processor, Inc.</a> and
+    <a href="http://www.thelinuxstore.com">The Linux Store</a> have provided
+# lully
+    an Alpha machine which is a development platform for the debian-alpha
+    team and also a Tier-1 Debian mirror.
+  <LI><a href="http://www.sun.com">Sun Microsystems</a> donated the server
+# auric
+    which powers the internal archive system.
+  <LI><a href="http://www.atipa.com">Atipa Linux Solutions</a> donated the
+# saens
+    server which runs ftp.debian.org.
 </UL>
 
+<p>Please see the list of <a href="http://db.debian.org/machines.cgi">debian.org
+developer machines</a> for more accurate information.
+
 <H3>The following is a list of organizations that have contributed to Debian by
-hosting mirror services</H3>
+hosting major mirror services:</H3>
 <UL>
-<LI><A HREF="http://www.mindspring.net">MindSpring</A> provides bandwidth for 
-	<A HREF="ftp://ftp.debian.org/">ftp.debian.org</a>.
-<LI><A href="http://irc.linpeople.org/">LISC</A> supports Debian by hosting
-    the #debian channel at irc.debian.org .
-<LI><A href="http://www.waw.com/waw/">Web At Work</A> sponsors
-    <A href="http://www.fr.debian.org/">http://www.fr.debian.org/</A>.
-<LI>The <A href="http://os.inf.tu-dresden.de/index_e.html">Operating Systems
+  <LI><A HREF="http://www.gigabell.com">Gigabell AG</A> provides bandwidth
+    for current <a href="ftp://ftp.debian.org/">ftp.debian.org</a>.
+  <LI><A HREF="http://www.mindspring.net">MindSpring</A> provided bandwidth
+    for <a href="ftp://ftp.debian.org/">ftp.debian.org</a>.
+  <LI><A href="http://irc.linpeople.org/">LISC</A> (nowadays
+    <a href="http://openprojects.nu/">Open Projects Network</a>) supports
+    Debian by hosting Debian-related IRC channels at irc.debian.org .
+  <LI><A href="http://www.waw.com/waw/">Web At Work</A> sponsors
+    <A href="http://www.fr.debian.org/">www.fr.debian.org</A>.
+  <LI>The <A href="http://os.inf.tu-dresden.de/index_e.html">Operating Systems
     Group</A> at <A href="http://www.tu-dresden.de/">Dresden University of
     Technology</A> sponsors
-    <A href="http://www.de.debian.org/">http://www.de.debian.org/</A>.
-<LI><SPAN lang=es><A href="http://www.es.debian.org/sponsor.html">El Departamento de Física Fundamental y Experimental</A></SPAN>
-    at
-    <SPAN lang=es><A href="http://www.dfis.ull.es/laguna.html">la Universidad de La Laguna</A></SPAN>
-    sponsors
-    <A href="http://www.es.debian.org/">http://www.es.debian.org/</A>
+    <A href="http://www.de.debian.org/">www.de.debian.org</A>.
+  <LI><SPAN lang=es><A href="http://www.es.debian.org/sponsor.html">El
+    Departamento de Física Fundamental y Experimental</A></SPAN> at
+    <SPAN lang=es><A href="http://www.dfis.ull.es/laguna.html">la Universidad
+    de La Laguna</A></SPAN> sponsors
+    <A href="http://www.es.debian.org/">www.es.debian.org</A>
     (don't you wish you lived in the Canary Islands!).
-<LI><A href="http://www.netvillage.co.jp/">NetVillage Co.,Ltd.</A> sponsors
-    <A href="http://www.jp.debian.org/">http://www.jp.debian.org/</A> and
-    <A href="ftp://ftp.jp.debian.org/pub/Linux/debian/">ftp://ftp.jp.debian.org/pub/Linux/debian/</A>.
-<LI><A href="http://www.atnet.at/">AT-nctt</A> sponsors
-    <A href="http://www.at.debian.org/">http://www.at.debian.org/</A> and
-    <A href="ftp://ftp.at.debian.org/">ftp://ftp.at.debian.org/</A>
-<LI><a href="http://www.hands.com/">Philip Hands</a> and
+  <LI><A href="http://www.netvillage.co.jp/">NetVillage Co., Ltd.</A> sponsors
+    <A href="http://www.jp.debian.org/">www.jp.debian.org</A> and
+    <A href="ftp://ftp.jp.debian.org/pub/Linux/debian/">ftp.jp.debian.org</A>.
+  <LI><A href="http://www.atnet.at/">at-net</A> sponsors
+    <A href="http://www.at.debian.org/">www.at.debian.org</A> and
+    <A href="ftp://ftp.at.debian.org/">ftp.at.debian.org</A>
+  <LI><a href="http://www.hands.com/">Philip Hands</a> and
     <a href="http://www.netcom.net.uk/">Netcom UK</a>, who provide
     <a href="http://www.uk.debian.org/">www.uk.debian.org</a>'s hardware and 
     bandwidth respectively.
-<LI><a href="http://www.tenet.pl">Centrum Edukacji Komputerowej TECHTRONIC</a>
-    sponsors <a href="http://www.pl.debian.org">http://www.pl.debian.org</a>.
+  <LI><a href="http://www.tenet.pl">Centrum Edukacji Komputerowej TECHTRONIC</a>
+    sponsors <a href="http://www.pl.debian.org">www.pl.debian.org</a>.
 </UL>
 
 <P>Debian is grateful to these and all the groups around the world that
 provide mirrors. Without them, none of this would have been possible.
 
-<H3>The following is a list of the organizations that have made other donations to Debian:</H3>
+<H3>The following is a list of the organizations that have made other donations
+to Debian:</H3>
 <UL>
-	<LI><A HREF="http://www.linuxcentral.com/">LinuxCentral</A> has supported Debian at events including Atlanta Linux Showcase and LinuxWorld Expo.
-</UL>  
+  <LI><A HREF="http://www.linuxcentral.com/">LinuxCentral</A> has supported
+    Debian at events including Atlanta Linux Showcase and LinuxWorld Expo.
+</UL>