Jumbo commit for 4.7 installation instructions:

- do not mention tape as an installation media on systems where it is very
  unlikely that a tape drive can be connected to (i.e. anything with only
  USB as expansion capabilities)
- do not mention that fetching the installation sets from a partition is
  ``for upgrades only''. You may do this for installation, but of course
  you can not use a partition which will be newfs'ed for that purpose.
- mention ext2fs partitions as possible installation sets source only on
  platforms where the installation media actually can mount an ext2fs
  filesystem.
- stress the fact that the sparc miniroot image is a GENERIC kernel with
  a little on-disk filesystem, and not a RAMDISK kernel with a little
  in-memory filesystem, and thus must not be overwritten during installation
  (i.e. be careful if you repartition the disk the miniroot has been put on).
- more conv=sync -> conv=osync for tape setup instructions.
- model-specific layout changes on armish, loongson and socppc instructions.
- fix various typos and grammar mistaeks.

"sure" deraadt@ (without eyeballing)

2 files changed, 6 insertions, 7 deletions

diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index ad647a1b88b..003e88e3698 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.45 2009/05/13 18:38:29 miod Exp $
+dnl	$OpenBSD: install,v 1.46 2010/03/16 17:23:09 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -57,7 +57,7 @@ OpenBSDInstallPart5({:-
 	If you have DOS or Linux partitions defined on the disk, these
 	will usually show up as partition 'i', 'j' and so on.-:})
 
-OpenBSDInstallPart6({:-CD-ROM, -:})
+OpenBSDInstallPart6({:-CD-ROM, tape, -:})
 
 OpenBSDURLInstall
 
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index d43632a5e81..5119705f6d6 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -1,10 +1,10 @@
-dnl	$OpenBSD: xfer,v 1.28 2007/08/02 17:33:12 david Exp $
+dnl	$OpenBSD: xfer,v 1.29 2010/03/16 17:23:09 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
-	FFS partitions (for upgrades only)
-	DOS (FAT) partitions (for upgrades only)
-	EXT2 partitions (for upgrades only)
+	FFS partitions
+	DOS (FAT) partitions
+	EXT2 partitions (NOT supported if booting from floppy)
 	Tape
 dnl	Remote NFS partition
 	FTP
@@ -41,7 +41,6 @@ Creating a PXE network bootable setup using OpenBSD or other Un*x-like system:
 
 OpenBSDXferShortPrelude
 
-
 OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 dnl OpenBSDXferNFS