===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/61.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** www/61.html	2017/03/05 15:39:51	1.10
--- www/61.html	2017/03/05 23:19:47	1.11
***************
*** 298,305 ****
  your BIOS options first.
  <p>
  <li>
! If your machine can boot from USB, you can write <i>install60.fs</i> or
! <i>miniroot60.fs</i> to a USB stick and boot from it.
  <p>
  <li>
  If you can't boot from a CD, floppy disk, or USB,
--- 298,305 ----
  your BIOS options first.
  <p>
  <li>
! If your machine can boot from USB, you can write <i>install61.fs</i> or
! <i>miniroot61.fs</i> to a USB stick and boot from it.
  <p>
  <li>
  If you can't boot from a CD, floppy disk, or USB,
***************
*** 320,327 ****
  your BIOS options first.
  <p>
  <li>
! If your machine can boot from USB, you can write <i>install60.fs</i> or
! <i>miniroot60.fs</i> to a USB stick and boot from it.
  <p>
  <li>
  If you can't boot from a CD, floppy disk, or USB,
--- 320,327 ----
  your BIOS options first.
  <p>
  <li>
! If your machine can boot from USB, you can write <i>install61.fs</i> or
! <i>miniroot61.fs</i> to a USB stick and boot from it.
  <p>
  <li>
  If you can't boot from a CD, floppy disk, or USB,
***************
*** 354,360 ****
  <p>
  <li>
  If this doesn't work, or if you don't have a CDROM drive, you can write
! <i>CD3:6.1/sparc64/floppy60.fs</i> or <i>CD3:6.1/sparc64/floppyB60.fs</i>
  (depending on your machine) to a floppy and boot it with <i>boot
  floppy</i>. Refer to INSTALL.sparc64 for details.
  <p>
--- 354,360 ----
  <p>
  <li>
  If this doesn't work, or if you don't have a CDROM drive, you can write
! <i>CD3:6.1/sparc64/floppy61.fs</i> or <i>CD3:6.1/sparc64/floppyB61.fs</i>
  (depending on your machine) to a floppy and boot it with <i>boot
  floppy</i>. Refer to INSTALL.sparc64 for details.
  <p>
***************
*** 363,369 ****
  will most likely fail.
  <p>
  <li>
! You can also write <i>CD3:6.1/sparc64/miniroot60.fs</i> to the swap partition on
  the disk and boot with <i>boot disk:b</i>.
  <p>
  <li>
--- 363,369 ----
  will most likely fail.
  <p>
  <li>
! You can also write <i>CD3:6.1/sparc64/miniroot61.fs</i> to the swap partition on
  the disk and boot with <i>boot disk:b</i>.
  <p>
  <li>
***************
*** 374,381 ****
  
  <ul style="list-style-type: none">
  <li>
! Write <i>FTP:6.1/alpha/floppy60.fs</i> or
! <i>FTP:6.1/alpha/floppyB60.fs</i> (depending on your machine) to a diskette and
  enter <i>boot dva0</i>. Refer to INSTALL.alpha for more details.
  <p>
  <li>
--- 374,381 ----
  
  <ul style="list-style-type: none">
  <li>
! Write <i>FTP:6.1/alpha/floppy61.fs</i> or
! <i>FTP:6.1/alpha/floppyB61.fs</i> (depending on your machine) to a diskette and
  enter <i>boot dva0</i>. Refer to INSTALL.alpha for more details.
  <p>
  <li>
***************
*** 404,410 ****
  
  <ul style="list-style-type: none">
  <li>
! Write <i>miniroot60.fs</i> to the start of the CF
  or disk, and boot normally.
  </ul>
  
--- 404,410 ----
  
  <ul style="list-style-type: none">
  <li>
! Write <i>miniroot61.fs</i> to the start of the CF
  or disk, and boot normally.
  </ul>
  
***************
*** 412,418 ****
  
  <ul style="list-style-type: none">
  <li>
! Write <i>miniroot60.fs</i> to a USB stick and boot bsd.rd from it
  or boot bsd.rd via tftp.
  Refer to the instructions in INSTALL.loongson for more details.
  </ul>
--- 412,418 ----
  
  <ul style="list-style-type: none">
  <li>
! Write <i>miniroot61.fs</i> to a USB stick and boot bsd.rd from it
  or boot bsd.rd via tftp.
  Refer to the instructions in INSTALL.loongson for more details.
  </ul>
***************
*** 438,444 ****
  
  <ul style="list-style-type: none">
  <li>
! To install, burn cd60.iso on a CD-R, put it in the CD drive of your
  machine and select <i>Install System Software</i> from the System Maintenance
  menu. Indigo/Indy/Indigo2 (R4000) systems will not boot automatically from
  CD-ROM, and need a proper invocation from the PROM prompt.
--- 438,444 ----
  
  <ul style="list-style-type: none">
  <li>
! To install, burn cd61.iso on a CD-R, put it in the CD drive of your
  machine and select <i>Install System Software</i> from the System Maintenance
  menu. Indigo/Indy/Indigo2 (R4000) systems will not boot automatically from
  CD-ROM, and need a proper invocation from the PROM prompt.
***************
*** 463,471 ****
  
  <h3 id="upgrade"><font color="#0000e0">How to upgrade</font></h3>
  
! If you already have an OpenBSD 5.9 system, and do not want to reinstall,
  upgrade instructions and advice can be found in the
! <a href="faq/upgrade60.html">Upgrade Guide</a>.
  <p>
  
  <hr>
--- 463,471 ----
  
  <h3 id="upgrade"><font color="#0000e0">How to upgrade</font></h3>
  
! If you already have an OpenBSD 6.0 system, and do not want to reinstall,
  upgrade instructions and advice can be found in the
! <a href="faq/upgrade61.html">Upgrade Guide</a>.
  <p>
  
  <hr>