===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/ftp.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- www/ftp.html	1997/10/07 06:17:30	1.36
+++ www/ftp.html	1997/10/11 19:28:14	1.37
@@ -45,14 +45,9 @@
 This is a list of currently known ftp servers:<p>
 
 <dl>
-<li><strong>Switzerland</strong>: <a href=ftp://ftp.openbsd.org/pub/OpenBSD>
-ftp://ftp.openbsd.org/pub/OpenBSD ==
-ftp://ftp.eu.openbsd.org/pub/OpenBSD</a><br>
-located in Switzerland.
-<!-- mw@eunet.ch -->
-
 <li><strong>Canada</strong>: <a href=ftp://lager.ucs.ualberta.ca/pub/OpenBSD>
 ftp://lager.ucs.ualberta.ca/pub/OpenBSD ==
+ftp://ftp.openbsd.org/pub/OpenBSD ==
 ftp://ftp1.ca.openbsd.org/pub/OpenBSD</a><br>
 located in Edmonton, Alberta, Canada.
 <!-- beck@panopticon.ucs.ualberta.ca -->
@@ -63,17 +58,23 @@
 located in Kanata, Ontario, Canada.
 <!-- wojtek@tryc.on.ca -->
 
+<li><strong>Switzerland</strong>: <a href=ftp://ftp.eu.openbsd.org/pub/OpenBSD>
+ftp://web.eunet.ch/pub/OpenBSD ==
+ftp://ftp.eu.openbsd.org/pub/OpenBSD</a><br>
+located in Switzerland.
+<!-- mw@eunet.ch -->
+
 <li><strong>USA</strong>: <a href=ftp://pub.seastrom.com/pub/OpenBSD>
 ftp://pub.seastrom.com/pub/OpenBSD ==
 ftp://ftp1.usa.openbsd.org/pub/OpenBSD</a><br>
 located in Virginia, Eastern USA.<br>
 <!-- rs@seastrom.com -->
 
-<li><strong>France</strong>: <a href=ftp://ftp.ibp.fr/pub/OpenBSD>
-ftp://ftp.ibp.fr/pub/OpenBSD ==
-ftp://ftp.fr.openbsd.org/pub/OpenBSD</a><br>
-located in France.<br>
-<!-- ftpmaint@ibp.fr -->
+<li><strong>USA</strong>: <a href=ftp://news.pacifier.com/pub/OpenBSD>
+ftp://news.pacifier.com/pub/OpenBSD ==
+ftp://ftp2.usa.openbsd.org/pub/OpenBSD</a><br>
+located in Portland, Oregon, western USA.<br>
+<!-- downsj@pacifier.com -->
 
 <li><strong>USA</strong>: <a href=ftp://freestuff.cs.colorado.edu/pub/OpenBSD>
 ftp://freestuff.cs.colorado.edu/pub/OpenBSD ==
@@ -81,23 +82,29 @@
 located in Boulder, Colorado, western USA.<br>
 <!-- Todd.Miller@cs.colorado.edu -->
 
+<li><strong>USA</strong>: <a href=ftp://openbsd.eecs.umich.edu:/pub/OpenBSD>
+ftp://openbsd.eecs.umich.edu/pub/OpenBSD ==
+ftp://ftp4.usa.openbsd.org/pub/OpenBSD</a><br>
+located in Michigan, USA.<br>
+<!-- steveh@eecs.umich.edu -->
+
 <li><strong>USA</strong>: <a href=ftp://alpha.ctaz.com/pub/OpenBSD>
 ftp://alpha.ctaz.com/pub/OpenBSD ==
 ftp://ftp5.usa.openbsd.org/pub/OpenBSD</a><br>
 located in Arizona, western USA.<br>
 <!-- toddf@openbsd.org -->
 
-<li><strong>USA</strong>: <a href=ftp://openbsd.eecs.umich.edu:/pub/OpenBSD>
-ftp://openbsd.eecs.umich.edu/pub/OpenBSD ==
-ftp://bigfoot.eecs.umich.edu/pub/OpenBSD</a><br>
-located in Michigan, USA.<br>
-<!-- steveh@eecs.umich.edu -->
-
 <li><strong>USA</strong>: <a href=ftp://ftp.op.net/pub/OpenBSD>
 ftp://ftp.op.net/pub/OpenBSD</a><br>
 located in Pennsylvania, eastern USA.<br>
 <!-- no idea -->
 
+<li><strong>France</strong>: <a href=ftp://ftp.ibp.fr/pub/OpenBSD>
+ftp://ftp.ibp.fr/pub/OpenBSD ==
+ftp://ftp.fr.openbsd.org/pub/OpenBSD</a><br>
+located in France.<br>
+<!-- ftpmaint@ibp.fr -->
+
 <li><strong>Germany</strong>: <a href=ftp://ftp.fu-berlin.de/pub/unix/openbsd/mirrors/OpenBSD>
 ftp://ftp.fu-berlin.de/pub/unix/openbsd/mirrors/OpenBSD ==
 ftp://ftp.de.openbsd.org/pub/unix/openbsd/mirrors/OpenBSD</a><br>
@@ -106,12 +113,13 @@
 
 <li><strong>Japan</strong>: <a href=ftp://ftp.tut.ac.jp/OpenBSD>
 ftp://ftp.tut.ac.jp/OpenBSD ==
-ftp://ftp.jp.openbsd.org/OpenBSD</a><br>
+ftp://ftp1.jp.openbsd.org/OpenBSD</a><br>
 located at Toyohashi University of Technology, Aichi, JAPAN
 <!-- Keijiro Umehara ume@ftp.tut.ac.jp -->
 
 <li><strong>Japan</strong>: <a href=ftp://ftp.dti.ad.jp/pub/OpenBSD>
-ftp://ftp.dti.ad.jp/pub/OpenBSD</a><br>
+ftp://ftp.dti.ad.jp/pub/OpenBSD ==
+ftp://ftp2.jp.openbsd.org/pub/OpenBSD</a><br>
 located at Dream Train Internet, JAPAN
 <!-- rabit@dti.ad.jp -->
 
@@ -177,7 +185,7 @@
 <hr>
 <a href=index.html><img src=back.gif border=0 alt=OpenBSD></a> 
 <a href=mailto:www@openbsd.org>www@openbsd.org</a>
-<br><small>$OpenBSD: ftp.html,v 1.36 1997/10/07 06:17:30 johns Exp $</small>
+<br><small>$OpenBSD: ftp.html,v 1.37 1997/10/11 19:28:14 deraadt Exp $</small>
 
 </body>
 </html>