Mention install floppy and X11.

3 files changed, 46 insertions, 54 deletions

diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 1216ee870cd..2e09b0344ec 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,8 +1,8 @@
-dnl	$OpenBSD: contents,v 1.4 2004/02/11 23:29:58 miod Exp $
+dnl	$OpenBSD: contents,v 1.5 2004/03/08 22:31:28 miod Exp $
 TopPart
 dnl uncomment as stuff becomes available
 dnl
-dnl OpenBSDfloppy
+OpenBSDfloppy
 dnl
 dnl		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 dnl				this one features all the drivers not available
@@ -12,10 +12,10 @@ dnl
 dnl		floppyC{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 dnl				this one features most of the cardbus and
 dnl				pcmcia drivers; see below.
-dnl
-dnl		cdrom{:--:}OSrev.fs	The MACHINE boot and installation
-dnl				2.88MB floppy image that contains almost all
-dnl				OpenBSD drivers; see below.
+
+		cdrom{:--:}OSrev.fs	The MACHINE boot and installation
+				2.88MB floppy image that contains almost all
+				OpenBSD drivers; see below.
 
 OpenBSDdistsets
 
@@ -25,8 +25,7 @@ OpenBSDrd
 
 OpenBSDcd
 
-dnl Uncomment when floppies are available, and if this really is
-dnl worth providing...
+dnl Uncomment if this really is worth providing...
 dnl
 dnl As well you may be interested in
 dnl
@@ -36,13 +35,12 @@ dnl		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe;
 dnl		see installation section, below.
 dnl
 dnl
-dnl uncomment as stuff becomes available
-dnl OpenBSDfloppydesc(three,Each,s)
+OpenBSDfloppydesc(,The)
 dnl
 dnl In addition, the "tools/" directory contains some utilities that might be
 dnl useful for the installation.
-dnl
-DistributionDescription(six)
+
+DistributionDescription(ten)
 
 OpenBSDbase(,,shared)
 
@@ -55,11 +53,11 @@ OpenBSDgame
 OpenBSDman
 
 OpenBSDmisc
-dnl
-dnl OpenBSDxbase
-dnl
-dnl OpenBSDxfont
-dnl
-dnl OpenBSDxserv
-dnl
-dnl OpenBSDxshare
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
+
+OpenBSDxshare
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 79786f6e06e..0836d6bb1f4 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.2 2004/02/07 22:47:49 miod Exp $
+dnl	$OpenBSD: install,v 1.3 2004/03/08 22:31:28 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with another operating system,
@@ -13,32 +13,27 @@ that use the translated geometry.
 
 There are several ways to install OpenBSD onto a disk.  The easiest way,
 should your computer support it, is to boot off the OpenBSD CD-ROM, or
-off the bootable CD-ROM mini image.
-dnl Otherwise, you can boot from a 3.5"
-dnl 1.44MB floppy disk if your machine has a floppy drive.
+off the bootable CD-ROM mini image. Otherwise, you can boot from a 3.5"
+1.44MB floppy disk if your machine has a floppy drive.
 
 OpenBSDInstallPart2
 
-dnl	With either the CD-ROM or the floppy in the drive, reboot your
-dnl	computer. You might have to play with your BIOS options to let the
-dnl	computer boot from the installation media, rather than the hard
-dnl	disk.
-	With the CD-ROM in the drive, reboot your computer. You might
-	have to play with your BIOS options to let the computer boot
-	from the installation media, rather than the hard disk.
-
-dnl	It will take a while to load the kernel from a floppy or slow
-dnl	speed CD-ROM drive, most likely more than a minute.  If some
-dnl	action doesn't eventually happen, or the spinning cursor has
-dnl	stopped and nothing further has happened, either your boot floppy
-dnl	is bad or you are having hardware problems. If trying another
-dnl	floppy disk doesn't help, try booting after disabling your CPU's
-dnl	internal and external caches (if any).  If it still doesn't work,
-dnl	OpenBSD probably can't be run on your hardware.  This can probably
-dnl	be considered a bug, so you might want to report it.
-dnl	If you do, please {:-include-:} as many details about your system
-dnl	configuration as you can.
-dnl
+	With either the CD-ROM or the floppy in the drive, reboot your
+	computer. You might have to play with your BIOS options to let the
+	computer boot from the installation media, rather than the hard
+	disk.
+
+	It will take a while to load the kernel from a floppy or slow
+	speed CD-ROM drive, most likely more than a minute.  If some
+	action doesn't eventually happen, or the spinning cursor has
+	stopped and nothing further has happened, either your boot floppy
+	is bad or you are having hardware problems. If trying another
+	floppy disk doesn't help, try booting after disabling your CPU's
+	internal and external caches (if any).  If it still doesn't work,
+	OpenBSD probably can't be run on your hardware.  This can probably
+	be considered a bug, so you might want to report it.
+	If you do, please {:-include-:} as many details about your system
+	configuration as you can.
 
 OpenBSDBootMsgs
 
@@ -46,7 +41,6 @@ OpenBSDBootMsgs
 	hit return to select the default (vt220).
 
 dnl Replace the following paragraph...
-dnl with this:
 	After entering the terminal type you will be asked whether you
         wish to do an "(I)nstall".  Enter 'I' for a fresh install.
 
@@ -57,6 +51,7 @@ dnl with this:
 	The name of the disk is typically "sd0" for SCSI drives or
 	"wd0" for IDE/RLL/ESDI/ST506 drives.
         Reply with the name of your disk.
+dnl with this:
 dnl OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
 dnl once upgrades are available
 
diff --git a/distrib/notes/amd64/xfer b/distrib/notes/amd64/xfer
index 54daf02f99d..c138be5c4a6 100644
--- a/distrib/notes/amd64/xfer
+++ b/distrib/notes/amd64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.2 2004/02/07 22:47:49 miod Exp $
+dnl	$OpenBSD: xfer,v 1.3 2004/03/08 22:31:28 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -10,14 +10,13 @@ dnl	Remote NFS partition
 	FTP
 	HTTP
 
-dnl Uncomment when floppies are available
-dnl If you can't (or don't want to) boot off a CD-ROM, you'll need to have
-dnl a floppy disk (1.44MB required).
-dnl
-dnl OpenBSDXferFloppyFromDOS
-dnl
-dnl OpenBSDXferFloppyFromUNIX
-dnl
+If you can't (or don't want to) boot off a CD-ROM, you'll need to have
+a floppy disk (1.44MB required).
+
+OpenBSDXferFloppyFromDOS
+
+OpenBSDXferFloppyFromUNIX
+
 
 OpenBSDXferShortPrelude