There have been no floppy images since the 6.2 release. Remove mention

of boot floppies from the INSTALL.alpha notes.
ok deraadt@

5 files changed, 22 insertions, 84 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index eccbc79af6c..851bf858b7c 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,39 +1,10 @@
-dnl	$OpenBSD: contents,v 1.62 2017/09/25 10:47:46 jsg Exp $
+dnl	$OpenBSD: contents,v 1.63 2020/04/28 13:02:10 benno Exp $
 TopPart
 
 OpenBSDminiroot
 			It can be copied to the swap partition of an existing
 			disk to allow installing or upgrading to OpenBSD OSREV.
 
-OpenBSDfloppy
-			This floppy image will boot on the following MACHINE
-			models:
-			- AlphaStation 200, 250, 255, 400
-			- AlphaServer 300 and 400
-			- AlphaStation 500, 600
-			- AlphaStation 600A, 1200
-			- AlphaServer 800, 1000, 1000A, 1200, 4000 and 4100
-			- AXPpci33 based machines, including ``Noname'',
-			  UDB, Multia
-			- EB164 based machines, including PC164, 164SX,
-			  and 164LX
-			- Personal Workstation (Miata)
-
-	floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy; see
-			below.
-			This floppy image will boot on the following MACHINE
-			models:
-   			- Alpha Processor, Inc. UP1000, UP1100, UP2000 and
-			  UP2000+
-			- XP900, XP1000, CS20, DS10, DS20, DS20L, ES40 and
-			  264DP
-
-	floppyC{:--:}OSrev.fs	Another MACHINE boot and installation floppy; see
-			below.
-			This floppy image will boot on the following MACHINE
-			models:
-   			- Tadpole AlphaBook
-
 OpenBSDdistsets
 
 OpenBSDbsd
@@ -57,8 +28,6 @@ OpenBSDcd
 	netboot.mop	The OpenBSD/MACHINE network boot loader, for MOP
 			protocol.
 
-OpenBSDfloppydesc(three,Each,s)
-
 DistributionDescription(eight)
 
 OpenBSDbase(101660534,244170752)
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 1c0033aafa9..9d9c7ab52cc 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,25 +1,11 @@
-dnl	$OpenBSD: install,v 1.41 2019/08/01 19:42:52 jmc Exp $
+dnl	$OpenBSD: install,v 1.42 2020/04/28 13:02:10 benno Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
 to boot from the bootable CD-ROM mini image, then install from your favorite
-source. You can also use one of the OpenBSD installation floppies, if your
-machine has a floppy drive. Network booting is supported through means of
+source. Network booting is supported through means of
 dhcpd(8) and tftpd(8).
 
-Booting from Floppy Disk installation media:
-
-	At the SRM console prompt, enter
-		boot dva0
-	You should see info about the primary and secondary boot
-	and then the kernel should start to load.  It will take a
-	while to load the kernel from the floppy, most likely more
-	than a minute.  If some action doesn't eventually happen,
-	or the spinning cursor has stopped and nothing further has
-	happened, or the machine spontaneously reboots, then either
-	you have a bad boot floppy (in which case you should try
-	another) or your alpha is not currently supported by OpenBSD.
-
 Booting from CD-ROM installation media:
 
 	At the SRM console prompt, enter
@@ -36,12 +22,12 @@ Booting from CD-ROM installation media:
 		boot DEVICE
 	where DEVICE is the dka device name.
 
-	You should see info about the primary and secondary boot
-	and then the kernel should start to load.  If the kernel
-	fails to load or the spinning cursor has stopped and nothing
-	further has happened, you either have a hardware problem or
-	your MACHINE is not currently supported by OpenBSD; try booting
-	from a floppy instead if possible.
+	You should see info about the primary and secondary boot and then the
+	kernel should start to load.  If the kernel fails to load or the
+	spinning cursor has stopped and nothing further has happened, you
+	either have a hardware problem or your MACHINE is not currently
+	supported by OpenBSD; try booting from the network instead if
+	possible.
 
 Booting from Network:
 
@@ -124,7 +110,7 @@ Booting from Network:
 	    Once loaded, the boot loader will mount /alpha over NFS and load
 	    the kernel from there.
 
-Installing using the Floppy, CD-ROM or Network procedure:
+Installing using the CD-ROM or Network procedure:
 
 OpenBSDInstallPart2
 
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index 29fda76e463..5676f84617d 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.32 2014/02/03 05:35:40 miod Exp $
+dnl	$OpenBSD: prep,v 1.33 2020/04/28 13:02:10 benno Exp $
 OpenBSD/MACHINE requires the SRM console.  Some alphas come with
 the AlphaBIOS (also known as the ARC firmware on older machines) instead;
 this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS
@@ -63,8 +63,7 @@ Using the SRM console:
 
     To see a list of devices connected to your alpha, you can
     use the "show device" command.  For booting, the devices you
-    are interested in are "dva0" (the floppy drive) and
-    "dka*" (the disk drives).
+    are interested in are "dka*" (the disk drives).
 
     You can set ROM variables by saying "set VARIABLE VALUE".
     Some variables you will want to set:
diff --git a/distrib/notes/alpha/upgrade b/distrib/notes/alpha/upgrade
index 2f7455824ac..d0131adc486 100644
--- a/distrib/notes/alpha/upgrade
+++ b/distrib/notes/alpha/upgrade
@@ -1,2 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.8 2008/08/06 20:50:51 miod Exp $
-OpenBSDUpgrade({:-the CD-ROM or an installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.9 2020/04/28 13:02:10 benno Exp $
+OpenBSDUpgrade({:-the CD-ROM-:})
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index 957b6f97f4d..9fb9074e4b5 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -1,29 +1,24 @@
-dnl	$OpenBSD: xfer,v 1.33 2019/08/01 19:42:52 jmc Exp $
+dnl	$OpenBSD: xfer,v 1.34 2020/04/28 13:02:10 benno Exp $
 Installation is supported from several media types, including:
 
-	CD-ROM (NOT supported if booting from floppy)
+	CD-ROM
 	FFS partitions
 	HTTP
 
 If you can burn the bootable CD-ROM mini image, you can boot from it.
-Otherwise, you will need to create a bootable floppy disk.
 
 OpenBSDXferCDROM
 
-OpenBSDXferFloppyFromDOS
+If you do not have a CD-ROM drive on your alpha:
 
-OpenBSDXferFloppyFromUNIX
+	You can copy the miniroot image onto the hard disk you intend to
+	install OpenBSD on.  Doing so will overwrite the disk's old contents,
+	however.
 
-If you neither have a floppy drive nor a CD-ROM drive on your alpha:
-
-	If you don't have a floppy drive you can copy the floppy
-	image onto the hard disk you intend to install OpenBSD on.
-	Doing so will overwrite the disk's old contents, however.
-
-	You must use a Unix-like system to write the floppy image
+	You must use a Unix-like system to write the miniroot image
 	to the hard disk you will be using for OpenBSD/MACHINE.  You
 	should use the "dd" command to copy the file system image
-	(floppy{:--:}OSrev.fs or floppyB{:--:}OSrev.fs) directly to the raw 'c'
+	(miniroot{:--:}OSrev.fs) directly to the raw 'c'
 	device (whole disk) of the target hard disk.  It is suggested
 	that you read the dd(1) manual page or ask your system
 	administrator to determine the correct set of arguments to use;
@@ -31,17 +26,6 @@ If you neither have a floppy drive nor a CD-ROM drive on your alpha:
 	comprehensive list of the possibilities is beyond the scope of
 	this document.
 
-	Please note that this will put a floppy disklabel on your
-	disk which will confuse the install script.  To fix this
-	you need to ask for a shell (answer "s" to the first question)
-	when booting your disk and do "dd if=/dev/zero of=/dev/rsd0c
-	count=20", assuming you booted from sd0.  After doing this you will
-	not be able to boot that disk again unless you complete
-	the install.  You can now enter "install" and start the
-	actual install process.
-
-
-
 OpenBSDXferShortPrelude
 
 OpenBSDXferFFS