24 files changed, 41 insertions, 294 deletions
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index bbac6b18e76..a384201d0d1 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.38 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.39 2014/03/19 01:59:48 tedu Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -112,7 +112,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
@@ -122,8 +122,6 @@ OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index 5bb600ef636..b55fe283c3b 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -1,9 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.30 2014/02/27 20:18:10 tedu Exp $
+dnl	$OpenBSD: xfer,v 1.31 2014/03/19 01:59:48 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
 	FFS partitions
-	Tape
 	FTP
 	HTTP
 
@@ -46,6 +45,4 @@ If you neither have a floppy drive nor a CD-ROM drive on your alpha:
 
 OpenBSDXferShortPrelude
 
-OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
-
 OpenBSDXferFFS
diff --git a/distrib/notes/aviion/contents b/distrib/notes/aviion/contents
index 5c753470b35..16f7f27224f 100644
--- a/distrib/notes/aviion/contents
+++ b/distrib/notes/aviion/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.6 2014/02/28 21:37:59 miod Exp $
+dnl	$OpenBSD: contents,v 1.7 2014/03/19 01:59:48 tedu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -15,8 +15,6 @@ OpenBSDrd
 	boot		The OpenBSD/MACHINE disk boot loader, suitable for
 			booting from DG/UX.
 
-dnl These files can be used to make a bootable tape suitable for installation.
-dnl They can also be used to configure an NFS server to support installation
 These files can be used to configure an NFS server to support installation
 over the network. See the section "Getting the OpenBSD system onto Useful
 Media" for more information.
diff --git a/distrib/notes/aviion/install b/distrib/notes/aviion/install
index 5bd7ebed1aa..bb8a52b46f0 100644
--- a/distrib/notes/aviion/install
+++ b/distrib/notes/aviion/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.4 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.5 2014/03/19 01:59:48 tedu Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -62,9 +62,6 @@ if it the installation kernel has been copied to the root partition, or
 if it has been copied to a different partition (such as `usr').
 
 
-dnl document tape boot once the bootloader is st(4) capable
-dnl
-dnl Installing using the tape or netboot procedure:
 Installing using the DG/UX or network boot procedure:
 
 OpenBSDInstallPart2
@@ -84,7 +81,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, NFS, -:})
+OpenBSDInstallPart6({:-CD-ROM, NFS, -:})
 
 OpenBSDURLInstall
 
@@ -94,9 +91,6 @@ OpenBSDNFSInstall
 							
 OpenBSDDISKInstall(,{:-only -:})
 
-dnl OpenBSDTAPEInstall(2) once we have bootable tapes
-OpenBSDTAPEInstall
-
 OpenBSDCommonInstall
 
 OpenBSDInstallWrapup
diff --git a/distrib/notes/aviion/xfer b/distrib/notes/aviion/xfer
index ed361994c1d..f6a5822ef2b 100644
--- a/distrib/notes/aviion/xfer
+++ b/distrib/notes/aviion/xfer
@@ -1,21 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.2 2013/10/15 13:28:07 miod Exp $
+dnl	$OpenBSD: xfer,v 1.3 2014/03/19 01:59:48 tedu Exp $
 Installation is supported from several media types, including:
 
         CD-ROM
         FFS partitions
-        Tape
         Remote NFS partition
         FTP
         HTTP
 
 OpenBSDXferPrelude
 
-dnl once we can boot from tapes...
-dnl OpenBSDXferBootTape(xbase xetc xfont xserv xshare)
-dnl once we have X sets...
-dnl OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
-OpenBSDXferBareTape
-
 OpenBSDXferNFS
 
 OpenBSDXferFFS
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index e31d3655193..2d7f2e8e489 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,16 +1,13 @@
-dnl	$OpenBSD: install,v 1.25 2014/01/26 04:35:09 tedu Exp $
+dnl	$OpenBSD: install,v 1.26 2014/03/19 01:59:48 tedu Exp $
 dnl lots of texts coming from {mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
 Bootstrapping the installation ramdisk kernel is supported
-from either network, tape or CD-ROM.
+from either the network or a CD-ROM.
 
 
-Booting from Tape or CD-ROM installation media:
+Booting from CD-ROM installation media:
 
-  You can burn a bootable CD-ROM and boot from it or you can prepare an
-  installation tape as described in the "Creating an installation tape"
-  section earlier.
   To boot from SCSI CD-ROM, simply insert the CD into the drive before power
   up, then during the computer's self-test cycle, press the space bar.
   Subsequently at the PROM prompt issue a command:
@@ -33,10 +30,6 @@ Booting from Tape or CD-ROM installation media:
 
 	BOOT_ADMIN> boot p0
 
-  To boot from your tape type:
-
-	BOOT_ADMIN> boot p4
-
 
 Booting from Network:
 
@@ -137,7 +130,7 @@ OpenBSDInstallPart5(,{:-
 	plan to install a bootblock on this disk, you can reclaim this
 	space with the 'b' command.
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
@@ -149,8 +142,6 @@ OpenBSDDISKInstall(,{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/hppa/xfer b/distrib/notes/hppa/xfer
index 6e21bae6e76..ec95eff0312 100644
--- a/distrib/notes/hppa/xfer
+++ b/distrib/notes/hppa/xfer
@@ -1,17 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.10 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: xfer,v 1.11 2014/03/19 01:59:48 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
-	Tape
 	Remote NFS partition
 	FTP
 	HTTP
 
 OpenBSDXferPrelude
 
-OpenBSDXferBootTape(xbase xetc xfont xserv xshare,lif{:--:}OSrev.fs obs=2k conv=osync)
-
 OpenBSDXferNFS
 
 OpenBSDXferFFS
diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install
index 96226434f16..007a7be1836 100644
--- a/distrib/notes/landisk/install
+++ b/distrib/notes/landisk/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.9 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.10 2014/03/19 01:59:48 tedu Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -16,7 +16,7 @@ OpenBSDInstallMBRPart2(that's the way things are)
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
diff --git a/distrib/notes/loongson/install b/distrib/notes/loongson/install
index 0b7642156d8..87baa642981 100644
--- a/distrib/notes/loongson/install
+++ b/distrib/notes/loongson/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.13 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.14 2014/03/19 01:59:48 tedu Exp $
 OpenBSDInstallPrelude
 
 Booting the installation media:
@@ -79,9 +79,6 @@ OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:})
 
 OpenBSDCommonInstall
 
-dnl usb tape drives anyone?
-dnl OpenBSDTAPEInstall
-dnl
 OpenBSDInstallWrapup
 
 Lemote systems final steps:
diff --git a/distrib/notes/luna88k/contents b/distrib/notes/luna88k/contents
index 798f23f820f..038a28640b3 100644
--- a/distrib/notes/luna88k/contents
+++ b/distrib/notes/luna88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.14 2014/02/28 21:37:59 miod Exp $
+dnl	$OpenBSD: contents,v 1.15 2014/03/19 01:59:49 tedu Exp $
 TopPart
 
 OpenBSDminiroot
@@ -17,10 +17,6 @@ OpenBSDrd
 
 	boot		The OpenBSD/MACHINE boot block.
 
-dnl These files can be used to make a bootable tape suitable for installation.
-dnl See the section "Getting the OpenBSD system onto Useful Media" for more
-dnl information.
-dnl
 DistributionDescription(ten)
 
 OpenBSDbase(64527917,184893363)
diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install
index 4bff24b65af..851bfb80209 100644
--- a/distrib/notes/luna88k/install
+++ b/distrib/notes/luna88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.11 2014/02/27 18:55:39 miod Exp $
+dnl	$OpenBSD: install,v 1.12 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -24,27 +24,6 @@ using the shutdown(8) and/or halt(8) commands, which will eventually go
 back to the PROM prompt. Remember that the leftmost switch from the front
 panel DIP switch #1 must be down to access the PROM prompt.
 
-dnl Not until the bootblock can boot from tape.
-dnl Booting from an installation tape:
-dnl
-dnl    The internal tape drive is usually configured as SCSI ID #4. At the
-dnl    prompt, enter
-dnl
-dnl      b st(0,0,0)
-dnl
-dnl    to boot the first file from the tape. If your tape drive uses a
-dnl    different SCSI ID, replace the middle number with the appropriate number
-dnl    from the following table:
-dnl
-dnl      tape drive SCSI ID:     0 1 2 3 4 5 6
-dnl      middle number for st(): 4 3 2 1 0 6 5
-dnl
-dnl    If the tape drive is connected to the external SCSI controller, add 10 to
-dnl    the middle number. For example, to boot from a tape drive with ID #5
-dnl    connected to the external controller, enter:
-dnl
-dnl      b st(0,16,0)
-dnl
 Booting from an existing partition:
 
     Copy the OpenBSD/MACHINE boot loader on one of the first 8 partitions
@@ -114,7 +93,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, NFS, -:})
+OpenBSDInstallPart6({:-CD-ROM, NFS, -:})
 
 OpenBSDURLInstall
 
@@ -126,8 +105,6 @@ OpenBSDDISKInstall(,{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall(1)
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/luna88k/prep b/distrib/notes/luna88k/prep
index bacdb9c8ff7..5c8c81da166 100644
--- a/distrib/notes/luna88k/prep
+++ b/distrib/notes/luna88k/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.6 2014/02/27 18:55:39 miod Exp $
+dnl	$OpenBSD: prep,v 1.7 2014/03/19 01:59:49 tedu Exp $
 dnl Need to provide a short monitor description. Start from
 dnl http://www.nk-home.net/~aoyama/luna88k/monitor.txt
 dnl and also document NVRAM?
@@ -14,7 +14,7 @@ Setting up the boot device and filename:
   the machine's non-volatile memory.
 
   LUNA88K systems can only boot from SCSI devices. The boot device type
-  (either ``sd'' for a disk or ``st'' for a tape) is specified by the
+  (such as ``sd'' for a disk) is specified by the
   ``boot_device'' variable. The SCSI id of the boot device is specified
   by the ``boot_unit'' NVRAM variable, and the boot partition on said
   device is specified by the ``boot_partition'' variable. The
diff --git a/distrib/notes/luna88k/upgrade b/distrib/notes/luna88k/upgrade
index aa748c7d8a9..bca69330575 100644
--- a/distrib/notes/luna88k/upgrade
+++ b/distrib/notes/luna88k/upgrade
@@ -1,4 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.4 2014/02/27 18:55:39 miod Exp $
-dnl Not until tape boot works again
-dnl OpenBSDUpgrade({:-an installation tape, or a bsd.rd file on the root file system-:})
+dnl	$OpenBSD: upgrade,v 1.5 2014/03/19 01:59:49 tedu Exp $
 OpenBSDUpgrade({:-bsd.rd, or the miniroot-:})
diff --git a/distrib/notes/luna88k/xfer b/distrib/notes/luna88k/xfer
index bc7a75f4f06..feadce105dd 100644
--- a/distrib/notes/luna88k/xfer
+++ b/distrib/notes/luna88k/xfer
@@ -1,19 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.6 2013/10/30 22:06:36 miod Exp $
+dnl	$OpenBSD: xfer,v 1.7 2014/03/19 01:59:49 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
-	Tape
 	Remote NFS partition
 	FTP
 	HTTP
 
 OpenBSDXferPrelude
 
-dnl Not until tape boot works again
-dnl OpenBSDXferBootTape(xbase xetc xfont xshare,bsd.rd obs=8k conv=osync)
-OpenBSDXferBareTape(xbase xetc xfont xshare)
-
 OpenBSDXferNFS
 
 OpenBSDXferFFS
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 99886d5ec7b..ec3c4dcb1f9 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.107 2014/02/27 20:11:25 tedu Exp $
+dnl	$OpenBSD: m4.common,v 1.108 2014/03/19 01:59:48 tedu Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -600,36 +600,6 @@ define({:-OpenBSDURLInstall-:},
 		Then refer to the section named "installation set selection"
 		below.-:})dnl
 dnl
-dnl For arches where you can create a boot tape, $1 can be set as the
-dnl file index of the first set, after the boot files.
-define({:-OpenBSDTAPEInstall-:},
-{:-	To install from tape:
-		Unlike all other installation methods, there is no way
-		to know the names of the files on tape.  Because of this,
-		it is impossible to check that the files on tape match
-		the machine architecture and release of OpenBSD/MACHINE.
-
-		Moreover, since tape filenames are not known, the file
-		checksums can not be verified.  Use this installation
-		method only if there is no better option.
-
-		In order to install from tape, the distribution sets to be
-		installed must have been written to tape previously, either
-		in tar format or gzip-compressed tar format.
-
-		You will also have to identify the tape device where the
-		distribution sets are to be extracted from.  This will
-		typically be "nrst0" (no-rewind, raw interface).
-
-		Next you will have to specify how many files have to be
-		skipped on the tape.  This number is usually zero{:--:}ifelse(X$1,X,,{:-, unless
-		you have created a bootable tape, in which case the number
-		will be $1-:}).
-
-		The install program will not automatically detect whether
-		an image has been compressed, so it will ask for that
-		information before starting the extraction of each file.-:})dnl
-dnl
 define({:-OpenBSDCDROMInstall-:},
 {:-	To install from CD-ROM:
 		When installing from a CD-ROM, you will be asked which
@@ -993,112 +963,6 @@ define({:-OpenBSDXferFloppyFromUNIX-:},
 
 	Note that, when installing, the boot floppy can be write-protected
 	(i.e. read-only).-:})dnl
-dnl
-dnl Tape preparation instructions.
-dnl
-dnl OpenBSDXferBareTape describes how to set up a non-bootable distribution
-dnl tape, and takes as an optional argument, the list of X11 sets which
-dnl may be put on the tape.
-define({:-OpenBSDXferBareTape-:},
-{:-Creating an installation tape:
-
-	While you won't be able to boot OpenBSD from a tape, you can use
-	one to provide the installation sets.  To do so, you need to make
-	a tape that contains the distribution set files, each in "tar"
-	format or in "gzipped tar format".  First you will need to
-	transfer the distribution sets to your local system, using ftp or
-	by mounting the CD-ROM containing the release.  Then you need to
-	make a tape containing the files.
-
-	If you're making the tape on a UN*X-like system, the easiest way
-	to do so is make a shell script along the following lines, call it
-	"/tmp/maketape".
-
-	#! /bin/sh
-	TAPE=${TAPE:-/dev/nrst0}
-	mt -f ${TAPE} rewind
-	for file in base etc comp game man $1
-	do
-		dd if=${file}OSrev.tgz of=${TAPE} obs=8k conv=osync
-	done
-	tar cf ${TAPE} bsd
-	mt -f ${TAPE} offline
-	# end of script
-
-	And then:
-
-	cd .../OSREV/MACHINE
-	sh -x /tmp/maketape
-
-	If you're using a system other than OpenBSD, the tape
-	name and other requirements may change.  You can override the
-	default device name (/dev/nrst0) with the TAPE environment
-	variable.  For example, under Solaris, you would probably run:
-
-	TAPE=/dev/rmt/0n sh -x /tmp/maketape
-
-	Note that, when installing, the tape can be write-protected
-	(i.e. read-only).-:})dnl
-dnl OpenBSDXferBootTape describes how to set up a non-bootable distribution
-dnl tape, and takes as first argument, the list of X11 sets which may be put
-dnl on the tape.  Then at least one, and up to three arguments list the first
-dnl files to be put on the tape to make it bootable.  Each filename can be
-dnl followed by dd(1) arguments (such as conv=osync).
-define({:-OpenBSDXferBootTape-:},
-{:-Creating an (optionally bootable) installation tape:
-
-	To install OpenBSD from a tape, you need to make a tape that
-	contains the distribution set files, each in "tar" format or in
-	"gzipped tar format".  First you will need to transfer the
-	distribution sets to your local system, using ftp or by
-	mounting the CD-ROM containing the release.  Then you need to
-	make a tape containing the files.
-
-	If you're making the tape on a UN*X-like system, the easiest way
-	to do so is make a shell script along the following lines, call it
-	"/tmp/maketape".
-
-	#! /bin/sh
-	TAPE=${TAPE:-/dev/nrst0}
-	mt -f ${TAPE} rewind
-	if test {:-$-:}# -lt 1
-	then
-		dd of=${TAPE} if=$2
-ifelse(X$3,X,,{:-		dd of=${TAPE} if=$3
--:})dnl
-ifelse(X$4,X,,{:-		dd of=${TAPE} if=$4
--:})dnl
-	fi
-	for file in base etc comp game man $1
-	do
-		dd if=${file}OSrev.tgz of=${TAPE} obs=8k conv=osync
-	done
-	tar cf ${TAPE} bsd
-	mt -f ${TAPE} offline
-	# end of script
-
-	And then:
-
-	cd .../OSREV/MACHINE
-	sh -x /tmp/maketape
-
-        Note that, by default, this script creates a bootable tape.  If
-	you only want to fetch the OpenBSD files from tape, but want to
-	boot from another device, you can save time and space creating
-	the tape this way:
-
-        cd .../OSREV/MACHINE
-        sh -x /tmp/maketape noboot
-
-	If you're using a system other than OpenBSD, the tape
-	name and other requirements may change.  You can override the
-	default device name (/dev/nrst0) with the TAPE environment
-	variable.  For example, under Solaris, you would probably run:
-
-	TAPE=/dev/rmt/0n sh -x /tmp/maketape
-
-	Note that, when installing, the tape can be write-protected
-	(i.e. read-only).-:})dnl
 dnl OpenBSDXferNFS [(noupgrade)]
 define({:-OpenBSDXferNFS-:},
 {:-To install OpenBSD using a remote partition, mounted via
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index ff6b2a75060..0838b8b0380 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.32 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.33 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -140,7 +140,7 @@ OpenBSDInstallPart5({:-
 	automatically installed if you setup a small (a few MB) MSDOS
 	partition as position `i' in the label.
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
@@ -152,8 +152,6 @@ OpenBSDDISKInstall(,,{:- or MS-DOS-:})
 		
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index fd62a95b4b4..88574fe7c00 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.26 2014/01/06 21:05:32 miod Exp $
+dnl	$OpenBSD: install,v 1.27 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -182,7 +182,7 @@ OpenBSDInstallPart5
 dnl XXX Note that this is a #$%@ boot blocks limitation which should be fixed
 dnl XXX by reading the real label in the boot blocks.
 
-OpenBSDInstallPart6({:-CD-ROM, tape, NFS -:})
+OpenBSDInstallPart6({:-CD-ROM, NFS -:})
 
 OpenBSDURLInstall
 
@@ -194,8 +194,6 @@ OpenBSDDISKInstall(,{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/sgi/xfer b/distrib/notes/sgi/xfer
index 3c98e06da2a..feadce105dd 100644
--- a/distrib/notes/sgi/xfer
+++ b/distrib/notes/sgi/xfer
@@ -1,17 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.6 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: xfer,v 1.7 2014/03/19 01:59:49 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
-	Tape
 	Remote NFS partition
 	FTP
 	HTTP
 
 OpenBSDXferPrelude
 
-OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
-
 OpenBSDXferNFS
 
 OpenBSDXferFFS
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 106954d6179..611b52e1804 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: install,v 1.74 2011/06/15 21:36:48 miod Exp $
+dnl	$OpenBSD: install,v 1.75 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk.  The normal way
 is to use the OpenBSD CD-ROM, or the bootable CD-ROM mini image, or an
-installation floppy, or an installation tape, depending on your hardware.
+installation floppy, depending on your hardware.
 Alternatively, if you already have an operating system installed and
 do not wish to change the existing partition layout, it is simpler to
 use the OpenBSD miniroot that can be booted off your local disk's swap
@@ -121,30 +121,6 @@ drive vs. SCSI-ID shuffling and partition a=0, b=1...
 (*) for sun4 this is scsi-target*8+scsi-lun (usually 0) expressed in hex...
 
 
-Booting from SCSI tape:
-
-Boot the miniroot by typing the appropriate command at the PROM:
-
-	> b st(,,1)			# for sun4 monitors
-					# (not working currently)
-	ok boot st(,,1)			# for version 1 OpenBOOT ROMs
-	ok boot tape:1			# for version 2 OpenBOOT ROMs
-	ok boot /sbus/esp/st@4,0:1	# for version 2 OpenBOOT ROMs
-					# that won't take tape:n syntax.
-	
-The above instructions assume your tape drive is the default tape drive
-using SCSI ID 4. If your drive uses ID 5, modify the boot command
-accordingly:
-
-	> b st(,28,1)		# example - 2nd tape drive on sun4 monitors
-	ok boot st(,5,1)	# example - 2nd tape drive on v1 OpenBOOT ROM
-	ok boot tape1:1		# example - 2nd tape drive on v2 OpenBOOT ROM
-	ok boot /sbus/esp/st@5,0:1	# example - 2nd tape drive on v2
-					# OpenBOOT ROM that won't take
-					# tape:n syntax
-	
-
-
 Installing using a diskless setup:
 
 First, you must set up a diskless client configuration on a server. If
@@ -165,7 +141,7 @@ this command takes one of the following forms:
 	ok boot net bsd.rd	# for version 2 OpenBOOT ROMs
 
 
-Installing using the Floppy, CD-ROM, tape, miniroot or netboot procedure:
+Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
 
 OpenBSDInstallPart2
 
@@ -186,7 +162,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
@@ -196,8 +172,6 @@ OpenBSDDISKInstall({:-"xdN", "xyN" or -:},{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall(2)
-
 OpenBSDInstallWrapup
 
 After completing an installation:
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 21754c829fb..a04caeff8e7 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,9 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.46 2014/02/27 20:18:10 tedu Exp $
+dnl	$OpenBSD: xfer,v 1.47 2014/03/19 01:59:49 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
-	Tape
 	FTP
 	HTTP
 
@@ -16,7 +15,7 @@ However, not all SPARC systems support booting from CD-ROM, and the current
 boot image is only known to work on sun4c and sun4m architecture workstations.
 If you can boot from the CD-ROM, you are home free and can proceed to the
 installation steps.  If not, you will need to do some setup work to prepare
-a bootable image: either a floppy, hard drive, tape, or compatible net boot
+a bootable image: either a floppy, hard drive, or compatible net boot
 server.
 
 In addition to the bootable image, you also need to consider how to
@@ -25,7 +24,7 @@ access the binary distribution sets to actually install the system.
 Although you can access the distribution sets directly from the CD-ROM or
 from one of the FTP mirrors over the internet, you may wish to transfer
 the sets to a local FTP server, or copy them to a partition on the target
-system's disk or onto a SCSI tape.
+system's disk.
 
 OpenBSDXferCDROM
 
@@ -130,6 +129,4 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 OpenBSDXferPrelude
 
-OpenBSDXferBootTape(xbase xetc xfont xserv xshare,bsd.rd obs=8k conv=osync,boot obs=8k conv=osync)
-
 OpenBSDXferFFS
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 862963ac292..8937d996d98 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.47 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.48 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -104,7 +104,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, tape, -:})
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDURLInstall
 
@@ -114,8 +114,6 @@ OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 After completing an installation:
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index a92d16dd2dd..2ece70eda29 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,9 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.29 2014/02/27 20:18:10 tedu Exp $
+dnl	$OpenBSD: xfer,v 1.30 2014/03/19 01:59:49 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
 	FFS partitions
-	Tape
 	FTP
 	HTTP
 
@@ -82,6 +81,4 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 OpenBSDXferPrelude
 
-OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
-
 OpenBSDXferFFS
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 2a671c9fbf4..9037d43e320 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.25 2011/09/11 13:54:11 miod Exp $
+dnl	$OpenBSD: install,v 1.26 2014/03/19 01:59:49 tedu Exp $
 OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:})
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -105,7 +105,7 @@ OpenBSDInstallPart5(,{:-
 	The affected systems are: all VAXstation 3100, and MicroVAX
 	3100 models 10, 10e, 20 and 20e shipped before april 1992.-:})
 
-OpenBSDInstallPart6({:-CD-ROM, tape, NFS, -:})
+OpenBSDInstallPart6({:-CD-ROM, NFS, -:})
 
 OpenBSDURLInstall
 
@@ -115,8 +115,6 @@ OpenBSDNFSInstall
 
 OpenBSDDISKInstall(,{:-only -:})
 
-OpenBSDTAPEInstall
-
 OpenBSDCommonInstall
 
 OpenBSDInstallWrapup
diff --git a/distrib/notes/vax/xfer b/distrib/notes/vax/xfer
index 07272b49981..5e25c2b2880 100644
--- a/distrib/notes/vax/xfer
+++ b/distrib/notes/vax/xfer
@@ -1,19 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.11 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: xfer,v 1.12 2014/03/19 01:59:49 tedu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
-	Tape
 	Remote NFS partition
 	FTP
 	HTTP
 
 OpenBSDXferPrelude
 
-dnl Put back xserv when it is back
-dnl OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
-OpenBSDXferBareTape(xbase xetc xfont xshare)
-
 OpenBSDXferNFS
 
 OpenBSDXferFFS