===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/ftp.html,v
retrieving revision 1.763
retrieving revision 1.764
diff -c -r1.763 -r1.764
*** www/ftp.html	2018/03/23 22:45:17	1.763
--- www/ftp.html	2018/04/02 02:48:19	1.764
***************
*** 7,13 ****
  <title>OpenBSD: Mirrors</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <meta name="description" content="the OpenBSD FTP page">
! <meta name="copyright" content="This document copyright 1996-2017 by OpenBSD.">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="stylesheet" type="text/css" href="openbsd.css">
  <link rel="canonical" href="https://www.openbsd.org/ftp.html">
--- 7,13 ----
  <title>OpenBSD: Mirrors</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <meta name="description" content="the OpenBSD FTP page">
! <meta name="copyright" content="This document copyright 1996-2018 by OpenBSD.">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="stylesheet" type="text/css" href="openbsd.css">
  <link rel="canonical" href="https://www.openbsd.org/ftp.html">
***************
*** 28,41 ****
  
  <h3 id="mirrors">Download via HTTP/FTP</h3>
  
! OpenBSD can be obtained via HTTP or FTP.
! 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> for details.
  
  <p>
! Choose a mirror near you from the following list of <a href="#http">HTTP</a>,
  <a href="#ftp">FTP</a> and <a href="#rsync">rsync</a> mirrors which provide
  OpenBSD.
  
--- 28,41 ----
  
  <h3 id="mirrors">Download via HTTP/FTP</h3>
  
! OpenBSD can be obtained via HTTP(s) or FTP.
! Typically you only 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> for details.
  
  <p>
! Choose a mirror near you from the following list of <a href="#http">HTTP(s)</a>,
  <a href="#ftp">FTP</a> and <a href="#rsync">rsync</a> mirrors which provide
  OpenBSD.
  
***************
*** 44,52 ****
  and <a href="#prospective">information for prospective mirrors</a>.
  
  <hr>
! <h3 id="http">HTTP</h3>
  <p>
! This is a list of currently known HTTP/HTTPS servers &amp; mirrors:
  </p>
  
  <p><table>
--- 44,52 ----
  and <a href="#prospective">information for prospective mirrors</a>.
  
  <hr>
! <h3 id="http">HTTP(s)</h3>
  <p>
! This is a list of currently known HTTP(s) servers and mirrors:
  </p>
  
  <p><table>
***************
*** 1171,1181 ****
  <p>
  <ul>
  <li><strong>/pub/OpenBSD/</strong><br>
! 	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>
! <li><strong>/pub/OpenBSD/6.2/</strong><br>
  	Where you find our most recent release.
    <ul>
    <li><strong>alpha/</strong>
--- 1171,1181 ----
  <p>
  <ul>
  <li><strong>/pub/OpenBSD/</strong><br>
! 	Absolute path for mirrors where the OpenBSD FTP collection
! 	<strong>must</strong> be available. This location can be a link,
! 	if necessary.
  	<p>
! <li><strong>/pub/OpenBSD/6.3/</strong><br>
  	Where you find our most recent release.
    <ul>
    <li><strong>alpha/</strong>
***************
*** 1211,1218 ****
  <p>
  <li><strong>/pub/OpenBSD/tools/</strong><br>
      Various other little bits.
! <li><strong>/pub/OpenBSD/6.1/</strong><br>
!     Layout is similar to the 6.2 release described above.
  </ul>
  
  <h3 id="prospective">Information for prospective mirrors:</h3>
--- 1211,1219 ----
  <p>
  <li><strong>/pub/OpenBSD/tools/</strong><br>
      Various other little bits.
! <p>
! <li><strong>/pub/OpenBSD/6.2/</strong><br>
!     Layout is similar to the 6.3 release described above.
  </ul>
  
  <h3 id="prospective">Information for prospective mirrors:</h3>
***************
*** 1229,1239 ****
      <br>(including OpenSSH/, OpenNTPD/, OpenBGPD/, LibreSSL/, patches/,
           syspatch/ and tools/)
  </ul>
! In addition:
! <ul>
!   <li>serve files from the /pub/OpenBSD path
!   <li>use a second-level mirror as an upstream
! </ul>
  As of 6.1, the minimum space required is approximately 700GB.
  However, to reduce problems when snapshot packages are updated, it is
  recommended to use the rsync options "--delete-delay --delay-updates"
--- 1230,1238 ----
      <br>(including OpenSSH/, OpenNTPD/, OpenBGPD/, LibreSSL/, patches/,
           syspatch/ and tools/)
  </ul>
! 
! In addition, mirrors must use a second-level mirror as their upstream.
! <p>
  As of 6.1, the minimum space required is approximately 700GB.
  However, to reduce problems when snapshot packages are updated, it is
  recommended to use the rsync options "--delete-delay --delay-updates"
***************
*** 1256,1262 ****
  <b>do not</b> mirror from ftp.openbsd.org.
  <p>
  Mirror operators should subscribe to the low-volume
! <a href="mail.html#Mirrors">mirrors-announce</a> mailing list.
  
  </body>
  </html>
--- 1255,1262 ----
  <b>do not</b> mirror from ftp.openbsd.org.
  <p>
  Mirror operators should subscribe to the low-volume
! <a href="https://lists.openbsd.org/cgi-bin/mj_wwwusr?func=lists-long-full&extra=mirrors-announce">mirrors-announce</a>
! mailing list.
  
  </body>
  </html>