clarify

1 files changed, 19 insertions, 45 deletions

diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/ramdisk/install.md
index a831db27588..7f6fdcfd328 100644
--- a/distrib/alpha/ramdisk/install.md
+++ b/distrib/alpha/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.12 1997/10/11 08:12:23 deraadt Exp $
+#       $OpenBSD: install.md,v 1.13 1997/10/25 04:35:41 deraadt Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -155,52 +155,26 @@ md_prep_disklabel()
 
 	_disk=$1
 	md_checkfordisklabel $_disk
-	echo "Note: your disklabel editor is $EDITOR"
 	case $? in
 	0)
-		echo -n "Do you wish to edit the disklabel on $_disk? [y] "
 		;;
 	1)
-		echo "WARNING: Disk $_disk has no label"
-		echo -n "Do you want to create one with the disklabel editor? [y] "
+		echo "WARNING: Disk $_disk has no label. You will be creating a new one."
+		echo
 		;;
 	2)
-		echo "WARNING: Label on disk $_disk is corrupted"
-		echo -n "Do you want to try and repair the damage using the disklabel editor? [y] "
+		echo "WARNING: Label on disk $_disk is corrupted. You will be repairing."
+		echo
 		;;
 	esac
 
-	getresp "y"
-	case "$resp" in
-	y*|Y*) ;;
-	*)	return ;;
-	esac
-
 	# display example
 	cat << \__md_prep_disklabel_1
-
-Here is an example of what the partition information will look like once
-you have entered the disklabel editor. Disk partition sizes and offsets
-are in sector (most likely 512 bytes) units. Make sure these size/offset
-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.
-
-[Example]
-8 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)
-  c:   640192        0   unknown                        # (Cyl.    0 - 1428)
-  d:   525504   114688    4.2BSD     1024  8192    16   # (Cyl.  256 - 1428)
-[End of example]
+If you are unsure of how to use multiple partitions
+properly (ie. seperating /,  /usr, /tmp, /var, /usr/local, and other things)
+just split the space into a root and swap partition for now.
 
 __md_prep_disklabel_1
-	echo -n "Press [Enter] to continue "
-	getresp ""
 	disklabel -W ${_disk}
 	disklabel -E ${_disk}
 }
@@ -212,10 +186,10 @@ md_welcome_banner() {
 		echo "Welcome to the OpenBSD/alpha ${VERSION} installation program."
 		cat << \__welcome_banner_1
 
-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.
+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
 
 	else
@@ -230,19 +204,19 @@ 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
 	fi
 
 cat << \__welcome_banner_3
 
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
+As with anything which modifies your disk's contents, this program can
+cause SIGNIFICANT data loss, and you are advised to make sure your
+data is backed up before beginning the installation process.
 
-Default answers are displayed in brackets after the questions.
-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
+Default answers are displayed in brackets after the questions.  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