- fix a few texts

- remove dead hp300 stuff
ok millert@, espie@

6 files changed, 95 insertions, 306 deletions

diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md
index e2ffc9895ec..8e78cd2f12d 100644
--- a/distrib/amiga/install.md
+++ b/distrib/amiga/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.12 2002/03/31 17:30:30 deraadt Exp $
+#	$OpenBSD: install.md,v 1.13 2002/04/25 21:28:10 miod Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -125,16 +125,16 @@ md_welcome_banner() {
 	if [ "$MODE" = "install" ]; then
 		echo ""
 		echo "Welcome to the OpenBSD/amiga ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << \__welcome_banner_1
+		cat << __EOT
 
 This program is designed to help you put OpenBSD on your disk in a simple and
 rational way.
-__welcome_banner_1
+__EOT
 
 	else
 		echo ""
 		echo "Welcome to the OpenBSD/amiga ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << \__welcome_banner_2
+		cat << __EOT
 
 This program is designed to help you upgrade your OpenBSD system in a
 simple and rational way.
@@ -143,10 +143,10 @@ As a reminder, installing the `etc' binary set is NOT recommended.
 Once the rest of your system has been upgraded, you should manually
 merge any changes to files in the `etc' set into those files which
 already exist on your system.
-__welcome_banner_2
+__EOT
 	fi
 
-cat << \__welcome_banner_3
+cat << __EOT
 
 As with anything which modifies your disk's contents, this
 program can cause SIGNIFICANT data loss, and you are advised
@@ -158,17 +158,17 @@ You can hit Control-C at any time to quit, but if you do so at a
 prompt, you may have to hit return.  Also, quitting in the middle of
 installation may leave your system in an inconsistent state.
 
-__welcome_banner_3
+__EOT
 } | more
 }
 
 md_not_going_to_install() {
-	cat << \__not_going_to_install_1
+	cat << __EOT
 
 OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
 machine has halted, power-cycle the system and you'll get back to AmigaOS.
 
-__not_going_to_install_1
+__EOT
 }
 
 md_congrats() {
@@ -178,12 +178,12 @@ md_congrats() {
 	else
 		what="upgraded";
 	fi
-	cat << __congratulations_1
+	cat << __EOT
 
 CONGRATULATIONS!  You have successfully $what OpenBSD!
 To boot the installed system, enter halt at the command prompt. Once the
 system has halted, reset the machine, enter AmigaOS and boot via loadbsd
 without the -b flag, per the install document.
 
-__congratulations_1
+__EOT
 }
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 72d6cf0267a..2490b55902b 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.25 2002/04/21 17:09:18 deraadt Exp $
+#	$OpenBSD: install.md,v 1.26 2002/04/25 21:28:13 miod Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,20 +50,6 @@ md_set_term() {
 	getresp "hp300h"
 	TERM="$resp"
 	export TERM
-	# set screensize (i.e., for an xterm)
-	rows=`stty -a | grep rows | cutword 4`
-	columns=`stty -a | grep columns | cutword 6`
-	if [ "$rows" -eq 0 -o "$columns" -eq 0 ]; then
-		echo -n "Specify terminal rows [25]: "
-		getresp "25"
-		rows="$resp"
-
-		echo -n "Specify terminal columns [80]: "
-		getresp "80"
-		columns="$resp"
-
-		stty rows "$rows" columns "$columns"
-	fi
 }
 
 md_get_diskdevs() {
@@ -112,208 +98,6 @@ md_checkfordisklabel() {
 	return $rval
 }
 
-hp300_init_label_scsi_disk() {
-	# $1 is the disk to label
-
-	# Name the disks we install in the temporary fstab.
-	if [ "X${_disk_instance}" = "X" ]; then
-		_disk_instance="0"
-	else
-		_disk_instance=`expr $_disk_instance + 1`
-	fi
-	_cur_disk_name="install-disk-${_disk_instance}"
-
-	# Get geometry information from the user.
-	less << \__scsi_label_1
-
-You will need to provide some information about your disk's geometry.
-Geometry info for SCSI disks was printed at boot time.  If that information
-is not available, use the information provided in your disk's manual.
-Please note that the geometry printed at boot time is preferred.
-
-IMPORTANT NOTE: due to a limitation in the disklabel(8) program, the
-number of cylinders on the disk will be increased by 1 so that the initial
-label can be placed on disk for editing.  When the disklabel editor appears,
-make absolutely certain you subtract 1 from the total number of cylinders,
-and adjust the size of partition 'c' such that:
-
-	size = (sectors per track) * (tracks per cyl) * (total cylinders)
-
-Note that the disklabel editor will be run twice; once to set the size of
-partition 'c' and correct the geometry, and again so that you may correctly
-edit the partition map.  This is to work around the afore mentioned
-limitation in disklabel(8).  Apologies offered in advance.
-
-__scsi_label_1
-
-	# Give the opportunity to review the boot messages.
-	echo -n	"Review boot messages now? [y] "
-	getresp "y"
-	case "$resp" in
-	y*|Y*)	dmesg | less -rsS
-		;;
-	esac
-
-	echo	""
-	echo -n	"Number of bytes per disk sector? [512] "
-	getresp "512"
-	_secsize="$resp"
-
-	resp=""		# force one iteration
-	while [ "X${resp}" = "X" ]; do
-		echo -n	"Number of cylinders? "
-		getresp ""
-	done
-	_cylinders="$resp"
-	_fudge_cyl=`expr $_cylinders + 1`
-
-	resp=""		# force one iteration
-	while [ "X${resp}" = "X" ]; do
-		echo -n	"Number of tracks (heads)? "
-		getresp ""
-	done
-	_tracks_per_cyl="$resp"
-
-	resp=""		# force one iteration
-	while [ "X${resp}" = "X" ]; do
-		echo -n	"Number of disk sectors (blocks)? "
-		getresp ""
-	done
-	_nsectors="$resp"
-
-	# Calculate some values we need.
-	_sec_per_cyl=`expr $_nsectors / $_cylinders`
-	_sec_per_track=`expr $_sec_per_cyl / $_tracks_per_cyl`
-	_new_c_size=`expr $_sec_per_track \* $_tracks_per_cyl \* $_cylinders`
-
-	# Emit a disktab entry, suitable for getting started.
-	# What we have is a `c' partition with the total number of
-	# blocks, and an `a' partition with 1 sector; just large enough
-	# to open.  Don't ask.
-	echo	"" >> /etc/disktab
-	echo	"# Created by install" >> /etc/disktab
-	echo	"${_cur_disk_name}:\\" >> /etc/disktab
-	echo -n	"	:ty=winchester:ns#${_sec_per_track}:" >> /etc/disktab
-	echo	"nt#${_tracks_per_cyl}:nc#${_fudge_cyl}:\\" >> /etc/disktab
-	echo	"	:pa#1:\\" >> /etc/disktab
-	echo	"	:pc#${_nsectors}:" >> /etc/disktab
-
-	# Ok, here's what we need to do.  First of all, we install
-	# this initial label by opening the `c' partition of the disk
-	# and using the `-r' flag for disklabel(8).  However, because
-	# of limitations in disklabel(8), we've had to fudge the number
-	# of cylinders up 1 so that disklabel(8) doesn't complain about
-	# `c' running past the end of the disk, which can be quite
-	# common even with OEM HP drives!  So, we've given ourselves
-	# an `a' partition, which is the minimum needed to open the disk
-	# so that we can perform the DIOCWDLABEL ioctl.  So, once the
-	# initial label is installed, we open the `a' partition so that
-	# we can fix up the number of cylinders and make the size of
-	# `c' come out to (ncyl * ntracks_per_cyl * nsec_per_track).
-	# After that's done, we re-open `c' and let the user actually
-	# edit the partition table.  It's horrible, I know.  Bleh.
-
-	disklabel -W ${1}
-	if ! disklabel -r -w ${1} ${_cur_disk_name}; then
-		echo ""
-		echo "ERROR: can't bootstrap disklabel!"
-		rval="1"
-		return
-	fi
-
-	echo ""
-	echo "The disklabel editor will now start.  During this phase, you"
-	echo "must reset the 'cylinders' value to ${_cylinders}, and adjust"
-	echo "the size of partition 'c' to ${_new_c_size}.  Do not modify"
-	echo "the partition map at this time.  You will have the opportunity"
-	echo "to do so in a moment."
-	echo ""
-	echo -n	"Press <return> to continue. "
-	getresp ""
-
-	disklabel -W ${1}
-	if ! disklabel -r -e /dev/r${1}a; then
-		echo ""
-		echo "ERROR: can't fixup geometry!"
-		rval="1"
-		return
-	fi
-
-	cat << \__explain_motives_2
-
-Now that you have corrected the geometry of your disk, you may edit the
-partition map.  Don't forget to fill in the fsize (frag size), bsize
-(filesystem block size), and cpg (cylinders per group) values.  If you
-are unsure what these should be, use:
-
-	fsize: 1024
-	bsize: 4096
-	cpg: 16
-
-__explain_motives_2
-	echo -n	"Press <return> to continue. "
-	getresp ""
-
-	rval="0"
-	return
-}
-
-hp300_init_label_hpib_disk() {
-	# $1 is the disk to label
-
-	# We look though the boot messages attempting to find
-	# the model number for the provided disk.
-	_hpib_disktype=""
-	if dmesg | egrep "${1}: " > /dev/null 2>&1; then
-		_hpib_disktype=HP`dmesg | egrep "${1}: " | sort -u | \
-		    cutword 2 `
-	fi
-	if [ "X${_hpib_disktype}" = "X" ]; then
-		echo ""
-		echo "ERROR: $1 doesn't appear to exist?!"
-		rval="1"
-		return
-	fi
-
-	# Peer through /etc/disktab to see if the disk has a "default"
-	# layout.  If it doesn't, we have to treat it like a SCSI disk;
-	# i.e. prompt for geometry, and create a default to place
-	# on the disk.
-	if ! egrep "${_hpib_disktype}[:|]" /etc/disktab > /dev/null \
-	    2>&1; then
-		echo ""
-		echo "WARNING: can't find defaults for $1 ($_hpib_disktype)"
-		echo ""
-		hp300_init_label_scsi_disk $1
-		return
-	fi
-
-	# We've found the defaults.  Now use them to place an initial
-	# disklabel on the disk.
-	# XXX What kind of ugliness to we have to deal with to get around
-	# XXX stupidity on the part of disklabel semantics?
-	disklabel -W ${1}
-	if ! disklabel -r -w ${1} $_hpib_disktype; then
-		# Error message displayed by disklabel(8)
-		echo ""
-		echo "ERROR: can't install default label!"
-		echo ""
-		echo -n	"Try a different method? [y] "
-		getresp "y"
-		case "$resp" in
-		y*|Y*)	hp300_init_label_scsi_disk $1
-			return
-			;;
-		*)	rval="1"
-			return
-			;;
-		esac
-	fi
-
-	rval="0"
-	return
-}
-
 md_prep_disklabel()
 {
 	local _disk
@@ -331,12 +115,12 @@ md_prep_disklabel()
 	esac
 
 	# display example
-	cat << \__md_prep_disklabel_1
+	cat << __EOT
 
 If you are unsure of how to use multiple partitions properly
 (ie. separating /, /usr, /tmp, /var, /usr/local, and other things)
 just split the space into a root and swap partition for now.
-__md_prep_disklabel_1
+__EOT
 
 	disklabel -W ${_disk}
 	disklabel -f /tmp/fstab.${_disk} -E ${_disk}
@@ -350,15 +134,15 @@ md_welcome_banner() {
 (
 	if [ "$MODE" = "install" ]; then
 		echo "Welcome to the OpenBSD/hp300 ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << \__welcome_banner_1
+		cat << __EOT
 
 This program is designed to help you put OpenBSD on your system in a
 simple and rational way.
-__welcome_banner_1
+__EOT
 
 	else
 		echo "Welcome to the OpenBSD/hp300 ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << \__welcome_banner_2
+		cat << __EOT
 
 This program is designed to help you upgrade your OpenBSD system in a
 simple and rational way.
@@ -367,10 +151,10 @@ As a reminder, installing the `etc' binary set is NOT recommended.
 Once the rest of your system has been upgraded, you should manually
 merge any changes to files in the `etc' set into those files which
 already exist on your system.
-__welcome_banner_2
+__EOT
 	fi
 
-cat << \__welcome_banner_3
+cat << __EOT
 
 As with anything which modifies your disk's contents, this program can
 cause SIGNIFICANT data loss, and you are advised to make sure your
@@ -381,28 +165,28 @@ can hit Control-C at any time to quit, but if you do so at a prompt,
 you may have to hit return.  Also, quitting in the middle of
 installation may leave your system in an inconsistent state.
 
-__welcome_banner_3
+__EOT
 ) | less -E
 }
 
 md_not_going_to_install() {
-		cat << \__not_going_to_install_1
+		cat << __EOT
 
 OK, then.  Enter 'halt' at the prompt to halt the machine.  Once the
 machine has halted, power-cycle the system to load new boot code.
 
-__not_going_to_install_1
+__EOT
 }
 
 md_congrats() {
-	cat << \__congratulations_1
+	cat << __EOT
 
 CONGRATULATIONS!  You have successfully installed OpenBSD!  To boot the
 installed system, enter halt at the command prompt.  Once the system has
 halted, power-cycle the machine in order to load new boot code.  Make sure
 you boot from the root disk.
 
-__congratulations_1
+__EOT
 }
 
 md_native_fstype() {
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 3ab5237ca97..323848d4805 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.7 2002/03/31 17:30:30 deraadt Exp $
+#	$OpenBSD: install.md,v 1.8 2002/04/25 21:28:13 miod Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -154,23 +154,26 @@ md_init_mbr() {
 md_init_hfs() {
 	pdisk /dev/${1}c
 }
+
 md_checkfordisklabel() {
 	# $1 is the disk to check
 	local rval
 
-	echo
-	echo "Apple systems have two methods to label/partition a boot disk."
-	echo "Either the disk can be partitioned with Apple HFS partition"
-	echo "tools to contain an \"Unused\" partition, or without any"
-	echo "MacOS tools, the disk can be labled using an MBR partition table"
-	echo "If the HFS (DPME) partition table is used, after the disk is"
-	echo "partitioned with the Apple software, the \"Unused\" section"
-	echo "must be changed to type \"OpenBSD\" name \"OpenBSD\" using the"
-	echo "pdisk tool contained on this ramdisk. The disklabel can"
-	echo "then be edited normally"
-	echo "WARNING: the MBR partitioning code will HAPPILY overwrite/destroy"
-	echo "any HFS partitions on the disk, including the partition table."
-	echo "Choose the MBR option carefully, knowing this fact."
+	cat << __EOT
+
+Apple systems have two methods to label/partition a boot disk.
+
+Either the disk can be partitioned with Apple HFS partition tools to contain
+an "Unused" partition, or without any MacOS tools, the disk can be labled
+using an MBR partition table.
+If the HFS (DPME) partition table is used, after the disk is partitioned with
+the Apple software, the "Unused" section must be changed to type "OpenBSD" name
+"OpenBSD" using the pdisk tool contained on this ramdisk. The disklabel can
+then be edited normally.
+WARNING: the MBR partitioning code will HAPPILY overwrite/destroy any HFS
+partitions on the disk, including the partition table.
+Choose the MBR option carefully, knowing this fact.
+__EOT
 
 	echo -n "Do you want to choose (H)FS labeling or (M)BR labeling [H] "
 	getresp "h"
@@ -200,15 +203,16 @@ md_checkforMBRdisklabel() {
 	getresp "n"
 	case "$resp" in
 	n*|N*)	md_init_mbr $1;;
-	*)	echo
-		echo "You may keep your current setup if you want to be able to use any"
-		echo "already loaded OS. However you will be asked to prepare an empty"
-		echo "partition for OpenBSD later. There must also be at least ~0.5MB free space"
-		echo "in the boot partition to hold the OpenBSD bootloader."
-		echo
-		echo "Also note that the boot partition must be included as partition"
-		echo "'i' in the OpenBSD disklabel."
-		echo
+	*)	cat << __EOT
+You may keep your current setup if you want to be able to use any already
+loaded OS. However you will be asked to prepare an empty partition for OpenBSD
+later. There must also be at least ~0.5MB free space in the boot partition to
+hold the OpenBSD bootloader.
+
+Also note that the boot partition must be included as partition 'i' in the
+OpenBSD disklabel.
+
+__EOT
 		echo -n "Do you want to keep the current MSDOS partition setup? [y]"
 		getresp "y"
 		case "$resp" in
@@ -236,18 +240,19 @@ md_prep_fdisk()
 	local _done
 
 	_disk=$1
-	echo
-	echo "This disk has not previously been used with OpenBSD. You may share"
-	echo "this disk with other operating systems. However, to be able to boot"
-	echo "the system you will need a small DOS partition in the beginning of"
-	echo "the disk to hold the kernel boot. OpenFirmware understands"
-	echo "how to read an MSDOS style format from the disk."
-	echo
-	echo "This DOS style partitioning has been taken care of if"
-	echo "you chose to do that initialization earlier in the install."
-	echo
-	echo "WARNING: Wrong information in the BIOS partition table might"
-	echo "render the disk unusable."
+	cat << __EOT
+
+This disk has not previously been used with OpenBSD. You may share this disk
+with other operating systems. However, to be able to boot the system you will
+need a small DOS partition in the beginning of the disk to hold the kernel
+boot. OpenFirmware understands how to read an MSDOS style format from the disk.
+
+This DOS style partitioning has been taken care of if you chose to do that
+initialization earlier in the install"
+
+WARNING: Wrong information in the BIOS partition table might render the disk
+unusable.
+__EOT
 
 	echo -n "Press [Enter] to continue "
 	getresp ""
@@ -261,7 +266,7 @@ md_prep_fdisk()
 	_done=0
 	while [ $_done = 0 ]; do
 		echo
-		cat << \__md_prep_fdisk_1
+		cat << __EOT
 
 An OpenBSD partition should have type (i.d.) of 166 (A6), and should be the
 only partition marked as active. Also make sure that the size of the partition
@@ -272,7 +277,7 @@ The fdisk utility will be started update mode (interactive.)
 You will be able to add / modify this information as needed.
 If you make a mistake, simply exit fdisk without storing the new
 information, and you will be allowed to start over.
-__md_prep_fdisk_1
+__EOT
 		echo
 		echo -n "Press [Enter] to continue "
 		getresp ""
@@ -331,7 +336,7 @@ md_prep_disklabel()
 	esac
 
 	# display example
-	cat << \__md_prep_disklabel_1
+	cat << __EOT
 
 Disk partition sizes and offsets are in sector (most likely 512 bytes) units.
 You may set these size/offset pairs on cylinder boundaries
@@ -356,7 +361,7 @@ Do not change any parameters except the partition layout and the label name.
   h:  2008403  4256797    4.2BSD     1024  8192    16   # (Cyl. 4626*- 6809*)
   i:    10208       32     MSDOS                        # (Cyl.    0*- 11*)
 [End of example]
-__md_prep_disklabel_1
+__EOT
 	echo -n "Press [Enter] to continue "
 	getresp ""
 	if [[ $disklabeltype = "HFS" ]]
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index 34e43ebdc20..aca9e34008e 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.14 2002/04/17 01:59:57 deraadt Exp $
+#       $OpenBSD: install.md,v 1.15 2002/04/25 21:28:13 miod Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -126,7 +126,7 @@ md_prep_disklabel()
 	esac
 
 	# display example
-	cat << \__md_prep_disklabel_1
+	cat << __EOT
 
 Here is an example of what the partition information will look like once
 you have entered the disklabel editor. Disk partition sizes and offsets
@@ -135,11 +135,11 @@ pairs are on cylinder boundaries (the number of sector per cylinder is
 given in the `sectors/cylinder' entry, which is not shown here).
 
 Do not change any parameters except the partition layout and the label name.
-It's probably also wisest not to touch the `8 partitions:' line, even
-in case you have defined less than eight partitions.
+It's probably also wisest not to touch the `16 partitions:' line, even
+in case you have defined less than sixteen partitions.
 
 [Example]
-8 partitions:
+16 partitions:
 #        size   offset    fstype   [fsize bsize   cpg]
   a:    50176        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 111)
   b:    64512    50176      swap                        # (Cyl.  112 - 255)
@@ -147,7 +147,7 @@ in case you have defined less than eight partitions.
   d:   525504   114688    4.2BSD     1024  8192    16   # (Cyl.  256 - 1428)
 [End of example]
 
-__md_prep_disklabel_1
+__EOT
 	echo -n "Press [Enter] to continue "
 	getresp ""
 	disklabel -W ${_disk}
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index ef5e1eac35b..463e0419832 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.9 2002/03/31 17:30:31 deraadt Exp $
+#       $OpenBSD: install.md,v 1.10 2002/04/25 21:28:13 miod Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -140,7 +140,7 @@ md_prep_disklabel()
 	esac
 
 	# display example
-	cat << \__md_prep_disklabel_1
+	cat << __EOT
 
 Here is an example of what the partition information will look like once
 you have entered the disklabel editor. Disk partition sizes and offsets
@@ -149,11 +149,11 @@ pairs are on cylinder boundaries (the number of sector per cylinder is
 given in the `sectors/cylinder' entry, which is not shown here).
 
 Do not change any parameters except the partition layout and the label name.
-It's probably also wisest not to touch the `8 partitions:' line, even
-in case you have defined less than eight partitions.
+It's probably also wisest not to touch the `16 partitions:' line, even
+in case you have defined less than sixteen partitions.
 
 [Example]
-8 partitions:
+16 partitions:
 #        size   offset    fstype   [fsize bsize   cpg]
   a:    50176        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 111)
   b:    64512    50176      swap                        # (Cyl.  112 - 255)
@@ -161,7 +161,7 @@ in case you have defined less than eight partitions.
   d:   525504   114688    4.2BSD     1024  8192    16   # (Cyl.  256 - 1428)
 [End of example]
 
-__md_prep_disklabel_1
+__EOT
 	echo -n "Press [Enter] to continue "
 	getresp ""
 	disklabel -W ${_disk}
@@ -172,18 +172,18 @@ md_welcome_banner() {
 	if [ "$MODE" = "install" ]; then
 		echo ""
 		echo "Welcome to the OpenBSD/mvme88k ${VERSION_MAJOR}.${VERSION_MINOR} installation program."
-		cat << \__welcome_banner_1
+		cat << __EOT
 
 This program is designed to help you put OpenBSD on your disk,
 in a simple and rational way.  You'll be asked several questions,
 and it would probably be useful to have your disk's hardware
 manual, the installation notes, and a calculator handy.
-__welcome_banner_1
+__EOT
 
 	else
 		echo ""
 		echo "Welcome to the OpenBSD/mvme88k ${VERSION_MAJOR}.${VERSION_MINOR} upgrade program."
-		cat << \__welcome_banner_2
+		cat << __EOT
 
 This program is designed to help you upgrade your OpenBSD system in a
 simple and rational way.
@@ -192,10 +192,10 @@ As a reminder, installing the `etc' binary set is NOT recommended.
 Once the rest of your system has been upgraded, you should manually
 merge any changes to files in the `etc' set into those files which
 already exist on your system.
-__welcome_banner_2
+__EOT
 	fi
 
-cat << \__welcome_banner_3
+cat << __EOT
 
 As with anything which modifies your disk's contents, this
 program can cause SIGNIFICANT data loss, and you are advised
@@ -207,16 +207,16 @@ You can hit Control-C at any time to quit, but if you do so at a
 prompt, you may have to hit return.  Also, quitting in the middle of
 installation may leave your system in an inconsistent state.
 
-__welcome_banner_3
+__EOT
 }
 
 md_not_going_to_install() {
-	cat << \__not_going_to_install_1
+	cat << __EOT
 
 OK, then.  Enter `halt' at the prompt to halt the machine.  Once the
 machine has halted, power-cycle the system to load new boot code.
 
-__not_going_to_install_1
+__EOT
 }
 
 md_congrats() {
@@ -226,13 +226,13 @@ md_congrats() {
 	else
 		what="upgraded";
 	fi
-	cat << __congratulations_1
+	cat << __EOT
 
 CONGRATULATIONS!  You have successfully $what OpenBSD!
 To boot the installed system, enter halt at the command prompt. Once the
 system has halted, reset the machine and boot from the disk.
 
-__congratulations_1
+__EOT
 }
 
 md_native_fstype() {
diff --git a/distrib/mvmeppc/ramdisk/install.md b/distrib/mvmeppc/ramdisk/install.md
index 8c4ac04f873..7f40219cecc 100644
--- a/distrib/mvmeppc/ramdisk/install.md
+++ b/distrib/mvmeppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.5 2002/03/31 17:30:31 deraadt Exp $
+#	$OpenBSD: install.md,v 1.6 2002/04/25 21:28:13 miod Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -249,7 +249,7 @@ md_prep_fdisk()
 	_done=0
 	while [ $_done = 0 ]; do
 		echo
-		cat << \__md_prep_fdisk_1
+		cat << __EOT
 
 An OpenBSD partition should have type (i.d.) of 166 (A6), and should be the
 only partition marked as active. Also make sure that the size of the partition
@@ -260,7 +260,7 @@ The fdisk utility will be started update mode (interactive.)
 You will be able to add / modify this information as needed.
 If you make a mistake, simply exit fdisk without storing the new
 information, and you will be allowed to start over.
-__md_prep_fdisk_1
+__EOT
 		echo
 		echo -n "Press [Enter] to continue "
 		getresp ""
@@ -318,7 +318,7 @@ md_prep_disklabel()
 	esac
 
 	# display example
-	cat << \__md_prep_disklabel_1
+	cat << __EOT
 
 Disk partition sizes and offsets are in sector (most likely 512 bytes) units.
 You may set these size/offset pairs on cylinder boundaries
@@ -343,7 +343,7 @@ Do not change any parameters except the partition layout and the label name.
   h:  2008403  4256797    4.2BSD     1024  8192    16   # (Cyl. 4626*- 6809*)
   i:    10208       32     MSDOS                        # (Cyl.    0*- 11*)
 [End of example]
-__md_prep_disklabel_1
+__EOT
 	echo -n "Press [Enter] to continue "
 	getresp ""
 	if [[ $disklabeltype = "HFS" ]]