===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/ftp.html,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- www/ftp.html	2017/03/01 20:15:39	1.731
+++ www/ftp.html	2017/03/07 17:09:24	1.732
@@ -101,6 +101,13 @@
 	</td>
     </tr><tr>
 	<td>
+	<strong>Costa Rica</strong>
+	</td><td>
+	<a href="https://mirrors.ucr.ac.cr/pub/OpenBSD/" rel="nofollow">
+	https://mirrors.ucr.ac.cr/pub/OpenBSD/</a>
+	</td>
+    </tr><tr>
+	<td>
 	<strong>Denmark (Aalborg)</strong>
 	</td><td>
 	<a href="https://mirrors.dotsrc.org/pub/OpenBSD/" rel="nofollow">
@@ -327,13 +334,6 @@
 	</td>
     </tr><tr>
 	<td>
-	<strong>Costa Rica</strong>
-	</td><td>
-	<a href="http://mirrors.ucr.ac.cr/OpenBSD/" rel="nofollow">
-	http://mirrors.ucr.ac.cr/OpenBSD/</a>
-	</td>
-    </tr><tr>
-	<td>
 	<strong>Estonia (Tallinn)</strong>
 	</td><td>
 	<a href="http://ftp.aso.ee/pub/OpenBSD/" rel="nofollow">
@@ -561,8 +561,8 @@
 	<td>
 	<strong>Costa Rica</strong>
 	</td><td>
-	<a href="ftp://mirrors.ucr.ac.cr/OpenBSD/" rel="nofollow">
-	ftp://mirrors.ucr.ac.cr/OpenBSD/</a>
+	<a href="ftp://mirrors.ucr.ac.cr/pub/OpenBSD/" rel="nofollow">
+	ftp://mirrors.ucr.ac.cr/pub/OpenBSD/</a>
 	</td>
     </tr><tr>
 	<td>
@@ -1145,7 +1145,7 @@
 <p>
 <ul>
 <li><strong>/pub/OpenBSD/</strong><br>
-	Absolute path for HTTP and FTP mirrors where the OpenBSD FTP
+	Absolute path for HTTP(s) and FTP mirrors where the OpenBSD FTP
 	collection <strong>must</strong> be available. This location
 	can be a link, if necessary.
 	<p>
@@ -1154,7 +1154,6 @@
   <ul>
   <li><strong>alpha/</strong>
   <li><strong>amd64/</strong>
-  <li><strong>armish/</strong>
   <li><strong>armv7/</strong>
   <li><strong>hppa/</strong>
   <li><strong>i386/</strong>
@@ -1164,21 +1163,18 @@
   <li><strong>macppc/</strong>
   <li><strong>octeon/</strong>
   <li><strong>packages/</strong><br>
-	Binary packages (pre-compiled ports) to install on your -stable
-	system.
+       Binary packages (pre-compiled ports) to install on your -release
+       or -stable system. These are frozen at release time and not updated.
   <li><strong>sgi/</strong>
-  <li><strong>sparc/</strong>
   <li><strong>sparc64/</strong>
-  <li><strong>zaurus/</strong>
   <li><strong>src.tar.gz<br></strong>
 	Userland sources, which you would place in /usr/src.
-	(This does not include kernel sources)
   <li><strong>sys.tar.gz<br></strong>
-	The Kernel sources, which you would place in /usr/src/sys.
+	Kernel sources, which you would place in /usr/src/sys.
   <li><strong>ports.tar.gz<br></strong>
-	The ports sources, which you would place in /usr/ports.
+	Ports sources, which you would place in /usr/ports.
   <li><strong>xenocara.tar.gz<br></strong>
-	The X Window System (X11) sources.
+	X Window System sources, which you would place in /usr/xenocara.
   </ul>
 <p>
 <li><strong>/pub/OpenBSD/snapshots/</strong><br>
@@ -1187,11 +1183,11 @@
 	This is where we place those test releases.
 <p>
 <li><strong>/pub/OpenBSD/tools/</strong><br>
-	Various other little bits.
+    Various other little bits.
 <li><strong>/pub/OpenBSD/5.9/</strong><br>
-	Layout is similar to the 6.0 release described above.. for the nostalgic.
+    Layout is similar to the 6.0 release described above.. for the nostalgic.
 <li><strong>/pub/OpenBSD/5.8/</strong><br>
-	Layout is similar to the 6.0 release described above.. for the nostalgic.
+    Layout is similar to the 6.0 release described above.. for the nostalgic.
 </ul>
 
 <p id=prospective>
@@ -1201,7 +1197,7 @@
 Mirrors must carry the following:
 <ul>
   <li>OS and packages for <strong>all architectures</strong>
-  <li>at least the <strong>last two releases</strong> in binary form (currently 6.0 and 5.9)
+  <li>at least the <strong>last two releases</strong> in binary form
   <li><strong>up-to-date snapshots</strong> (no older than a week)
   <li><strong>all associated directories</strong>
     <br>(including OpenSSH/, OpenNTPD/, OpenBGPD/, patches/ and tools/)
@@ -1220,8 +1216,8 @@
 Depending on the disk space available, mirrors may provide more contents,
 such as older releases, current source tree, etc.
 <p>
-A suggested <a href="http://man.openbsd.org/?query=httpd.conf&amp;sektion=5">httpd.conf(5)</a>
-configuration for <a href="http://man.openbsd.org/?query=httpd&amp;sektion=5">httpd(8)</a>
+A suggested <a href="http://man.openbsd.org/httpd.conf">httpd.conf(5)</a>
+configuration for <a href="http://man.openbsd.org/httpd">httpd(8)</a>
 that is suitable for being www and ftp space mirror is <a href="httpd.conf">here</a>.
 <p>
 Operators of mirrors who are interested in having their site added to