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)

4 files changed, 22 insertions, 14 deletions

diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index 8088a8813ba..4d202009dc7 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: contents,v 1.13 2010/03/07 14:54:23 miod Exp $
+dnl	$OpenBSD: contents,v 1.14 2010/03/16 17:23:09 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
 dnl three flavours of OpenBSDbsd
 	bsd.IP27	A stock GENERIC-IP27 MACHINE kernel for IP27 and IP35
-			class machines, which will be installed on such systems
-			during the install.
+			class machines, which will be installed on such
+			systems during the install.
 
 	bsd.IP30	A stock GENERIC-IP30 MACHINE kernel for IP30 class
 			machines, which will be installed on such systems
@@ -38,7 +38,11 @@ dnl three flavours of OpenBSDrd
 			Used for simple installation from a pre-existing
 			system.
 
-OpenBSDcd
+dnl can't use OpenBSDcd because of the multiple bsd.rd
+	cd{:--:}OSrev.iso	A miniroot filesystem image suitable to be used
+			as a bootable CD-ROM image, but will require the base
+			and X sets be found via another media or network;
+			otherwise similar to the bsd.rd* images above.
 
 DistributionDescription(eleven)
 
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index f21b98a12ef..4768ef7b32a 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.18 2009/10/10 19:20:28 miod Exp $
+dnl	$OpenBSD: install,v 1.19 2010/03/16 17:23:09 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -84,7 +84,7 @@ OpenBSDInstallPart5
 dnl XXX Note that this is a #$%@ boot blocks limitation which should be fixed
 dnl XXX by reading the real label in the boot blocks.
 
-OpenBSDInstallPart6({:-CD-ROM, NFS -:})
+OpenBSDInstallPart6({:-CD-ROM, tape, NFS -:})
 
 OpenBSDURLInstall
 
@@ -92,6 +92,8 @@ OpenBSDCDROMInstall
 
 OpenBSDNFSInstall
 
+OpenBSDDISKInstall(,{:-only -:})
+
 OpenBSDCommonInstall
 
 OpenBSDTAPEInstall
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 4722237e8be..eabe422af35 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.18 2010/03/07 21:26:22 miod Exp $
+dnl	$OpenBSD: prep,v 1.19 2010/03/16 17:23:09 miod Exp $
 Before you install your system, you should identify your system family and
 familiarize yourself with the ARCBios setup and how to run programs from
 the Command monitor prompt.
@@ -72,7 +72,8 @@ Switching from serial to graphics console and vice versa:
 
     As of OpenBSD OSREV, supported graphics console devices are:
     - the onboard frame buffer on IP32 systems (gbe)
-    - ImpactSR (Mardigras) frame buffer on IP30 (I-Series and E-Series) (impact)
+    - ImpactSR (Mardigras) frame buffer on IP30 (I-Series and E-Series)
+      (impact)
     - VPro family frame buffers on IP27, IP30 and IP35 systems (odyssey)
 
     And the following graphics devices are not supported yet:
@@ -113,11 +114,12 @@ Setting the environment:
     When setting up the system to boot from disk, the ``OSLoader''
     environment variable will need to be changed.
 
-    Its default value is ``sash'', which is IRIX's standalone
+    Its default value is ``sash'' or ``sash64'', which is IRIX's standalone
     shell and loader. Set it to ``boot'', the OpenBSD boot loader.
 
-    Also, by default it tries to boot a kernel named ``/unix''. To
-    make it boot OpenBSD, set ``OSLoadFilename'' to ``/bsd''.
+    The kernel image loaded by default is specified in the ``OSLoadFilename''
+    variable, which defaults to ``/unix''.  To boot OpenBSD, set it to
+    ``/bsd''.
 
     To enable automatic booting of OpenBSD once the machine has passed its
     diagnostic tests, change the value of ``AutoLoad'' to ``Yes''.
diff --git a/distrib/notes/sgi/xfer b/distrib/notes/sgi/xfer
index e79f4c9b888..3c98e06da2a 100644
--- a/distrib/notes/sgi/xfer
+++ b/distrib/notes/sgi/xfer
@@ -1,14 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.5 2008/08/06 18:23:56 miod Exp $
+dnl	$OpenBSD: xfer,v 1.6 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
 	HTTP
 
-OpenBSDXferShortPrelude
+OpenBSDXferPrelude
 
 OpenBSDXferBareTape(xbase xetc xfont xserv xshare)