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, 4 insertions, 5 deletions

diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 8b820c12cc7..294b5c1dd70 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.23 2009/05/13 18:38:29 miod Exp $
+dnl	$OpenBSD: install,v 1.24 2010/03/16 17:23:09 miod Exp $
 OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:})
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -98,7 +98,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, NFS, -:})
+OpenBSDInstallPart6({:-CD-ROM, tape, NFS, -:})
 
 OpenBSDURLInstall
 
diff --git a/distrib/notes/vax/xfer b/distrib/notes/vax/xfer
index 6b24046f96e..07272b49981 100644
--- a/distrib/notes/vax/xfer
+++ b/distrib/notes/vax/xfer
@@ -1,8 +1,8 @@
-dnl	$OpenBSD: xfer,v 1.10 2008/08/06 18:23:56 miod Exp $
+dnl	$OpenBSD: xfer,v 1.11 2010/03/16 17:23:09 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
-	FFS partitions (for upgrades only)
+	FFS partitions
 	Tape
 	Remote NFS partition
 	FTP
@@ -10,7 +10,6 @@ Installation is supported from several media types, including:
 
 OpenBSDXferPrelude
 
-
 dnl Put back xserv when it is back
 dnl OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 OpenBSDXferBareTape(xbase xetc xfont xshare)