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)

3 files changed, 9 insertions, 10 deletions

diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install
index 59616d2e0b6..64358ddcf51 100644
--- a/distrib/notes/landisk/install
+++ b/distrib/notes/landisk/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.7 2009/05/13 18:38:29 miod Exp $
+dnl	$OpenBSD: install,v 1.8 2010/03/16 17:23:09 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -16,13 +16,13 @@ OpenBSDInstallMBRPart2(that's the way things are)
 
 OpenBSDInstallPart5
 
-OpenBSDInstallPart6({:-CD-ROM, -:})
+OpenBSDInstallPart6({:-CD-ROM, tape, -:})
 
 OpenBSDURLInstall
 
 OpenBSDCDROMInstall
 
-OpenBSDDISKInstall({:-"wdN" or -:},{:-only-:})
+OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:})
 
 OpenBSDCommonInstall
 
diff --git a/distrib/notes/landisk/prep b/distrib/notes/landisk/prep
index 7eea1b4e324..ed4e16adab3 100644
--- a/distrib/notes/landisk/prep
+++ b/distrib/notes/landisk/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.3 2007/02/28 22:30:05 miod Exp $
+dnl	$OpenBSD: prep,v 1.4 2010/03/16 17:23:09 miod Exp $
 The default configuration of the MACHINE systems comes with a Linux
 installation on the disk (either an IDE hard drive, or a CompactFlash
 card). At the moment, there is no known way to log in this installation
@@ -26,7 +26,6 @@ If the machine has a hard drive, and you had to change jumpers on it
 to change its ``master'' status, do not forget to configure it back
 to ``master'' or ``single drive'', as slave drives are not bootable.
 
-
 dnl I need to write a comprehensive text, also explaining that Rx/Tx
 dnl are swapped between the CF and HD models.
 In addition to the disk preparation, you will need to connect a serial
diff --git a/distrib/notes/landisk/xfer b/distrib/notes/landisk/xfer
index ecb27b4b223..efe67d90058 100644
--- a/distrib/notes/landisk/xfer
+++ b/distrib/notes/landisk/xfer
@@ -1,10 +1,10 @@
-dnl	$OpenBSD: xfer,v 1.3 2007/03/01 19:18:10 miod Exp $
+dnl	$OpenBSD: xfer,v 1.4 2010/03/16 17:23:09 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
-	FFS partitions (for upgrades only)
-dnl	DOS (FAT) partitions
-dnl	EXT2 partitions
+	FFS partitions
+	DOS (FAT) partitions
+	EXT2 partitions
 dnl	Tape
 	FTP
 	HTTP
@@ -14,7 +14,7 @@ from one of the FTP mirrors over the internet, you may wish to transfer
 the sets to a local FTP server, or copy them to a partition on the target
 system's disk (for upgrades only).
 
-OpenBSDXferPrelude
+OpenBSDXferShortPrelude
 
 dnl OpenBSDXferBareTape(xbase xetc xfont xshare)
 dnl