===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/ftp.html,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- www/ftp.html	2016/01/06 13:27:45	1.682
+++ www/ftp.html	2016/01/13 15:48:28	1.683
@@ -33,28 +33,28 @@
 system image files from our <a href="#mirrors">mirrors</a>:
 
 <ul>
-  <li><i>cd58.iso</i> to burn a minimal 5.8 CD-ROM
+  <li><i>cdXX.iso</i> to burn a minimal CD-ROM
    (roughly 8MB in size, boot only)
-  <li><i>install58.iso</i> to burn a full 5.8 CD-ROM
+  <li><i>installXX.iso</i> to burn a full CD-ROM
    (roughly 230MB in size, boot + sets)
-  <li><i>miniroot58.fs</i> to create a minimal 5.8 boot media
+  <li><i>minirootXX.fs</i> to create a minimal boot media
    (for flash or HD image installs -- roughly 5M in size, boot only)
-  <li><i>install58.fs</i> to burn a full 5.8 bootable disk file system
+  <li><i>installXX.fs</i> to burn a full bootable disk file system
    (for flash or HD image installs -- roughly 290M in size, boot + sets)
 
 </ul>
 
 <p>
-If you choose <i>cd58.iso</i> or <i>miniroot58.fs</i>, you will need to
+If you choose <i>cdXX.iso</i> or <i>minirootXX.fs</i>, you will need to
 get the base and X sets via another media or network.
-Otherwise, if you choose <i>install58.iso</i> or <i>install58.fs</i>,
+Otherwise, if you choose <i>installXX.iso</i> or <i>installXX.fs</i>,
 you will not need anything but the
 <a href="faq/faq15.html">application packages</a>.
 
 <p>
 Note that the paragraph above is also valid for the people interested in
 running <i>-current</i>.
-You can fetch <i>install58.iso</i> from the latest snapshot and install or
+You can fetch <i>installXX.iso</i> from the latest snapshot and install or
 upgrade your system very quickly.
 
 <hr>
@@ -62,7 +62,7 @@
   HTTP/FTP</a></font></h3>
 
 OpenBSD can also be obtained via HTTP or FTP.
-Typically you need a single small piece of boot media (e.g., a boot floppy)
+Typically you need a single small piece of boot media
 and then the rest of the files can be installed from a number of locations,
 including directly off the Internet.
 Consult the <a href="faq/faq4.html">Installation Guide</a> to get an 
@@ -509,8 +509,8 @@
 </table>
 
 <hr>
-<h3><font color="#0000e0"><a name=ftp>FTP</a></font></h3>
-This is a list of currently known FTP servers &amp; mirrors:<p>
+<h3><font color="#0000e0"><a name=ftp>HTTP/FTP</a></font></h3>
+This is a list of currently known HTTP/FTP servers &amp; mirrors:<p>
 
 <table>
     <tr>
@@ -1168,7 +1168,6 @@
   <li><strong>amd64/</strong>
   <li><strong>armish/</strong>
   <li><strong>armv7/</strong>
-  <li><strong>aviion/</strong>
   <li><strong>hppa/</strong>
   <li><strong>i386/</strong>
   <li><strong>landisk/</strong>
@@ -1204,16 +1203,6 @@
 	and binary packages from our development code.
 	This is where we place those test releases.
 <p>
-<li><strong>/pub/OpenBSD/src/</strong><br>
-	This is a cvs checkout of our daily source tree for those
-	who want to access individual files. Normally we recommend
-	the use of <a href="anoncvs.html">AnonCVS</a> instead of mirroring
-	this location. Thus, all ftp mirrors don't mirror this location.
-<p>
-<li><strong>/pub/OpenBSD/doc/</strong><br>
-	The OpenBSD <a href="faq/index.html">FAQ</a> in PDF and plain
-	text, as well as other OpenBSD-related documentation.
-<p>
 <li><strong>/pub/OpenBSD/tools/</strong><br>
 	Various other little bits.
 <li><strong>/pub/OpenBSD/5.7/</strong><br>
@@ -1231,7 +1220,7 @@
 patches/ and tools/), and keep them current; snapshots should not be
 older than a week.
 Note that in the above, "release" means <b>all files</b> under the specific
-directory (e.g. 5.8/).
+directory.
 This includes all architecture subdirectories and the complete packages
 subdirectory, with packages for all application architectures.
 As of 5.7, the minimum space required is approximately 600GB.