Minor random tweaks and fixes.

20 files changed, 78 insertions, 92 deletions

diff --git a/distrib/notes/armish/hardware b/distrib/notes/armish/hardware
index 16b7fb5afa3..bc6c5bed8e4 100644
--- a/distrib/notes/armish/hardware
+++ b/distrib/notes/armish/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.4 2007/03/09 22:43:37 deraadt Exp $
+dnl	$OpenBSD: hardware,v 1.5 2008/08/06 18:23:51 miod Exp $
 dnl When more than one model is supported, turn this into a list...
 OpenBSD/MACHINE runs on the Thecus N2100 and IOData HDL-G models at the moment.
 
@@ -255,6 +255,6 @@ Supported devices {:-include-:}:
 		USB-USB cables
 		USB Y@p phone
 	Keyboards
-		USB keyboards ???
+		USB keyboards
 	Pointing Devices
 		USB mice
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 06c5526162a..c3631c2259c 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.39 2008/03/10 21:25:52 miod Exp $
+dnl	$OpenBSD: contents,v 1.40 2008/08/06 18:23:56 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -10,7 +10,7 @@ OpenBSDrd
 	SYS_UBOOT	Unified boot file, used for booting from disk or
 			from the network.
 
-	SYS_CDBOOT	Raw boot file, used for booting from CD-ROM.
+	SYS_CDBOOT	Simplified boot file, used for booting from CD-ROM.
 
 DistributionDescription(eleven)
 
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index a01d5c3392c..d9c50752b2d 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -1,8 +1,8 @@
-dnl	$OpenBSD: hardware,v 1.23 2006/07/09 19:44:59 miod Exp $
+dnl	$OpenBSD: hardware,v 1.24 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV will run on most HP 9000/300- and 400-series
 machines.
 8MB of RAM should be sufficient to boot and a minimal system can probably
-be squeezed onto a 100MB partition by installing just the minimum sets.
+be squeezed onto a 120MB partition by installing just the minimum sets.
 To actually do much compiling or anything more interesting than
 booting, more RAM and disk space is highly recommended. About 250MB will be
 necessary to install all of the OpenBSD OSREV binary distribution (note that
diff --git a/distrib/notes/hppa/hardware b/distrib/notes/hppa/hardware
index 86c2fb8f92c..e6d2256309a 100644
--- a/distrib/notes/hppa/hardware
+++ b/distrib/notes/hppa/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.36 2008/07/16 16:41:03 miod Exp $
+dnl	$OpenBSD: hardware,v 1.37 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of HP9000 machines:
 dnl - PA7000-based
 dnl	705, 710, 720, 730, 750
@@ -115,16 +115,16 @@ Supported devices {:-include-:}:
 		AHA-19160B
 		AHA-29160[B,N]
 		AHA-39160
-- SGC/GSC graphics:
+- SGC/GSC graphics
 	Artist (as found on 712) (sti)
 	CRX-8, CRX-24, HCRX-8, HCRX-24 (sti)
-- RS-232 devices:
+- RS-232 devices
 	on-board NS16550 or similar serial ports (com)
-- Parallel ports:
+- Parallel ports
 	on-board parallel port (lpt)
-- Audio devices:
+- Audio devices
 	Harmony CS4215/AD1849 LASI audio (harmony)
-- Input devices:
+- Input devices
 	PS/2 keyboard (pckbd) and mouse (pms)
 	HIL keyboard (hilkbd), mouse and tablets (hilms)
 - Wireless Ethernet Adapters
diff --git a/distrib/notes/hppa/whatis b/distrib/notes/hppa/whatis
index 2c253dd4c97..131b76e1fa5 100644
--- a/distrib/notes/hppa/whatis
+++ b/distrib/notes/hppa/whatis
@@ -1,5 +1,6 @@
-dnl	$OpenBSD: whatis,v 1.4 2005/03/18 13:29:46 miod Exp $
+dnl	$OpenBSD: whatis,v 1.5 2008/08/06 18:23:56 miod Exp $
 
 OpenBSD/MACHINE OSREV runs on the HP 9000/700 series of workstations,
 based on 32 bit PA-RISC processors. Most letter-named models are also
-supported.
+supported, including many 64 bit PA-RISC 2.0-based models (running in
+32 bit mode).
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 8a5a4b9db0a..c904cbf7128 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.267 2008/07/27 16:36:09 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.268 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -39,17 +39,17 @@ dnl	       	The only CPU that is known to work poorly (due to
 dnl		flawed motherboard designs) is the Cyrix 386DLC.
 	Buses
 		All standard ISA, EISA, VLB, and PCI bus based machines,
-		including:
+		including among others:
 			Intel 450GX/KX based machines
 			Intel 450NX based machines
 			ServerWorks chipset-based machines
-			(We just had to mention those last three, since
-			 they are the hardest to support)
-		Both 16-bit PCMCIA Cards and newer 32-bit CardBus
-		support
+dnl Not worth bragging anymore
+dnl			(We just had to mention those last three, since
+dnl			 they are the hardest to support)
+		Both 16-bit PCMCIA Cards and newer 32-bit CardBus support
 		Universal Serial Bus (USB)
 		Inter IC (I2C) bus
-		The MCA bus found in various IBM PS/2 machines is not
+		The MCA bus found in various older IBM PS/2 machines is not
 		supported.
 	Bus Interfaces
 		Standard PCI-PCI bridges, including PCI expansion
@@ -1491,7 +1491,7 @@ dnl		XR16850-based ports (only in the pccom driver)
 		SoundForte RadioLink SF16-FMR FM radio
 		SoundForte RadioLink SF16-FMR2 FM radio
 	Miscellaneous Devices
-		APM power management,
+		APM power management (on non-ACPI systems)
 		Brooktree 8[47][89] based frame grabber and TV tuner cards,
 		including: [G]
 		    Animation Technologies FlyVideo
@@ -1593,9 +1593,10 @@ dnl		XR16850-based ports (only in the pccom driver)
 Drivers for hardware marked with [G] are only included in the GENERIC
 kernels, but are NOT included on the various distribution floppies
 (including the CD-ROM boot image).
-Drivers for hardware marked with [A] are not included in floppy A.
-Drivers for hardware marked with [B] are not included in floppy B.
-Drivers for hardware marked with [C] are not included in floppy C.
+Drivers for hardware marked with [A] are NOT included in floppy A.
+Drivers for hardware marked with [B] are NOT included in floppy B.
+Drivers for hardware marked with [C] are NOT included in floppy C.
+
 Support for devices marked with [*] is not included in the distribution media
 or in the GENERIC kernel, and will require you to compile a custom kernel to
 enable it.
diff --git a/distrib/notes/luna88k/xfer b/distrib/notes/luna88k/xfer
index aa46e9accdb..7151bb25611 100644
--- a/distrib/notes/luna88k/xfer
+++ b/distrib/notes/luna88k/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.3 2005/03/18 13:30:53 miod Exp $
+dnl	$OpenBSD: xfer,v 1.4 2008/08/06 18:23:56 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,7 +11,8 @@ Installation is supported from several media types, including:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBootTape(xbase xetc xfont xshare,bsd.rd obs=8k conv=sync)
+dnl OpenBSDXferBootTape(xbase xetc xfont xshare,bsd.rd obs=8k conv=sync)
+OpenBSDXferBootTape(,bsd.rd obs=8k conv=sync)
 
 OpenBSDXferNFS
 
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index cda5a110c38..ee7ad2c5bb9 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.14 2004/03/26 08:56:10 tom Exp $
+dnl	$OpenBSD: hardware,v 1.15 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
 	- MVME162 - Motorola with 68040 and IndustryPack slots
@@ -7,11 +7,10 @@ dnl 172 support is not complete
 dnl	- MVME172 - Motorola with 68060 and IndustryPack slots
 	- MVME177 - Motorola with 68060
 
-The minimal configuration requires 8MB of RAM and ~100MB of disk space. To
+The minimal configuration requires 8MB of RAM and ~160MB of disk space. To
 install the entire system requires much more disk space, and to compile the
-system, more RAM is recommended (OpenBSD with 8MB of RAM feels like Solaris
-with 8MB of RAM). Note that until you have 16MB of RAM, getting more RAM is
-more important than getting a faster CPU board.
+system, more RAM is recommended.  Note that until you have 16MB of RAM,
+getting more RAM is more important than getting a faster CPU board.
 
 Supported devices {:-include-:}:
 
diff --git a/distrib/notes/mvme88k/xfer b/distrib/notes/mvme88k/xfer
index 4e2caa6bb09..7eb29cf8a98 100644
--- a/distrib/notes/mvme88k/xfer
+++ b/distrib/notes/mvme88k/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.5 2005/03/18 13:30:53 miod Exp $
+dnl	$OpenBSD: xfer,v 1.6 2008/08/06 18:23:56 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,7 +11,7 @@ Installation is supported from several media types, including:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBootTape(,stboot obs=512,bootst obs=512,bsd.rd obs=8k conv=sync)
+OpenBSDXferBootTape(xbase xetc xfont xserv xshare,stboot obs=512,bootst obs=512,bsd.rd obs=8k conv=sync)
 
 OpenBSDXferNFS
 
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 160e9eb06fe..2228f0faa5a 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,6 +1,6 @@
-dnl	$OpenBSD: prep,v 1.11 2008/01/15 18:55:48 jasper Exp $
+dnl	$OpenBSD: prep,v 1.12 2008/08/06 18:23:56 miod Exp $
 Before you install your system, you should familiarize yourself with the
-ARCS setup and how to run programs from the Command monitor prompt.
+ARCBios setup and how to run programs from the Command monitor prompt.
 
 Accessing the Maintenance Console:
 
@@ -21,12 +21,7 @@ Accessing the Maintenance Console:
 
 Switching from serial to graphics console and vice versa:
 
-    Booting the ramdisk kernel can be done from the ARCS graphic console
-    although it might be more convenient to use the serial console for
-    the installation procedure. Some systems come with the serial console
-    enabled by default but sometimes this must be changed.
-
-    To change to serial console, go into the ARCS Maintenance Console
+    To change to serial console, go into the ARCBios Maintenance Console
     and change the ``console'' environment variable, and power-cycle
     the machine.
 
diff --git a/distrib/notes/sgi/xfer b/distrib/notes/sgi/xfer
index 8699a53940c..e79f4c9b888 100644
--- a/distrib/notes/sgi/xfer
+++ b/distrib/notes/sgi/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.4 2005/03/18 13:30:53 miod Exp $
+dnl	$OpenBSD: xfer,v 1.5 2008/08/06 18:23:56 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -10,7 +10,7 @@ Installation is supported from several media types, including:
 
 OpenBSDXferShortPrelude
 
-OpenBSDXferBareTape(xbase xetc xfont xshare)
+OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 OpenBSDXferNFS
 
diff --git a/distrib/notes/socppc/hardware b/distrib/notes/socppc/hardware
index 9fb96145107..c0fc51f6150 100644
--- a/distrib/notes/socppc/hardware
+++ b/distrib/notes/socppc/hardware
@@ -1,3 +1,3 @@
-dnl	$OpenBSD: hardware,v 1.1 2008/05/13 20:47:32 kettenis Exp $
+dnl	$OpenBSD: hardware,v 1.2 2008/08/06 18:23:56 miod Exp $
 dnl When more than one model is supported, turn this into a list...
-OpenBSD/MACHINE runs on the Thecus N1200 at the moment.
+OpenBSD/MACHINE only runs on the Thecus N1200 at the moment.
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index e8cf72bff3f..43848e9a38b 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.57 2008/03/10 21:25:53 miod Exp $
+dnl	$OpenBSD: contents,v 1.58 2008/08/06 18:23:56 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -13,7 +13,7 @@ OpenBSDdistsets
 OpenBSDbsd
 
 	bsd.scsi3	A kernel with SCSI target 3 re-mapped as 0 and 0
-			mapped as 3.
+			re-mapped as 3.
 
 OpenBSDrd
 
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 84a353c9a44..1957a8d80cf 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.74 2008/04/15 20:23:51 miod Exp $
+dnl	$OpenBSD: hardware,v 1.75 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
     * sun4: the VME series
 	- 4/100: Original SPARC with VME. Many hardware bugs.
@@ -67,13 +67,12 @@ For sun4m machines, the following mbus CPU modules are supported:
 	- Ross HyperSPARC RT620/625 at 166 MHz, with 512KB of primary cache
 	- Ross HyperSPARC RT620/625 at 180 MHz, with 512KB of primary cache
 
-The minimal configuration requires 12MB of RAM and ~120MB of disk space.
+The minimal configuration requires 16MB of RAM and ~160MB of disk space.
 To install the entire system requires much more disk space, and to run
-X or compile the system, more RAM is recommended.  (OpenBSD with 16MB of
-RAM or less feels like Solaris with 16MB of RAM or less.) Note that until
+X or compile the system, more RAM is recommended.  (OpenBSD with 32MB of
+RAM or less feels like Solaris with 32MB of RAM or less.) Note that until
 you have around 32MB of RAM, getting more RAM is more important than
-getting a faster CPU.)  Installation from "ramdisk" kernels requires 16MB
-of RAM.
+getting a faster CPU.)
 
 Supported devices {:-include-:}:
     * Sun keyboard and mouse
diff --git a/distrib/notes/vax/hardware b/distrib/notes/vax/hardware
index a0cdaad10f1..04bc0379769 100644
--- a/distrib/notes/vax/hardware
+++ b/distrib/notes/vax/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.23 2008/03/10 22:00:12 miod Exp $
+dnl	$OpenBSD: hardware,v 1.24 2008/08/06 18:23:56 miod Exp $
 OpenBSD/MACHINE OSREV runs on a wide variety of VAX hardware.
 The following systems have been tested:
 	- VAXstation 2000
@@ -69,5 +69,3 @@ Currently, your storage options for using OpenBSD/MACHINE are SCSI disks
 or tapes on one of the supported controllers, disks and tapes accessed
 through an appropriate QBUS MSCP controller, or an NFS root and swap.
 The latter is the only option for the diskless VXT2000 terminals.
-
-Please see below for details.
diff --git a/distrib/notes/vax/whatis b/distrib/notes/vax/whatis
index e5b88cd517b..bf863fa1941 100644
--- a/distrib/notes/vax/whatis
+++ b/distrib/notes/vax/whatis
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: whatis,v 1.8 2005/03/18 13:29:46 miod Exp $
+dnl	$OpenBSD: whatis,v 1.9 2008/08/06 18:23:56 miod Exp $
 
 OpenBSD/MACHINE runs on a broad range of VAX machines, formerly manufactured
-by Digital (now HP).
+by Digital (then Compaq, now HP).
diff --git a/distrib/notes/vax/xfer b/distrib/notes/vax/xfer
index 01ae2aa20e5..6b24046f96e 100644
--- a/distrib/notes/vax/xfer
+++ b/distrib/notes/vax/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.9 2006/08/14 13:23:19 miod Exp $
+dnl	$OpenBSD: xfer,v 1.10 2008/08/06 18:23:56 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,7 +11,9 @@ Installation is supported from several media types, including:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
+dnl Put back xserv when it is back
+dnl OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xshare)
 
 OpenBSDXferNFS
 
diff --git a/distrib/notes/zaurus/hardware b/distrib/notes/zaurus/hardware
index c1ab8d578bc..d1296a34bcf 100644
--- a/distrib/notes/zaurus/hardware
+++ b/distrib/notes/zaurus/hardware
@@ -1,9 +1,13 @@
-dnl	$OpenBSD: hardware,v 1.28 2008/04/01 14:40:58 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.29 2008/08/06 18:23:56 miod Exp $
 dnl When more than one model is supported, turn this into a list...
-OpenBSD/MACHINE runs on the Sharp Zaurus SL-C3000, SL-C3100 and
-SL-C3200 models at the moment.
+The following Sharp Zaurus models are supported by OpenBSD:
 
-Supported devices {:-include-:}:
+	SL-C3000
+	SL-C3100
+	SL-C3200
+
+In addition to the on-board devices (keyboard, touchscreen, microdrive,
+and serial ports), many USB devices are supported. These {:-include-:}:
 	Ethernet Adapters
 		ADMtek AN986-based USB adapters, including:
 		    Abocom UFE1000
@@ -332,9 +336,7 @@ Supported devices {:-include-:}:
 		    TDK LAK-CD011WL
 		    US Robotics 2410
 		    US Robotics 2445
-
 	Serial ports
-		On-board serial (com) ports
 		Most modems, digital cellular modems, and serial
 		cards should work
 	Universal Serial Bus (USB) Devices
@@ -353,15 +355,6 @@ Supported devices {:-include-:}:
 		USB Scanners
 		USB-USB cables
 		USB Y@p phone
-	Keyboards
-dnl C3000 specific. Mention it when C860 is supported but not its keyboard.
-		System keyboard
-		USB keyboards
-	Pointing Devices
-		USB mice
-dnl C3000 specific. Mention it when C860 is supported but not its display.
-	On-board Display (pxalcd)
-
 	Miscellaneous Devices
 		Meinberg Funkuhren radio clocks
 			USB5131 USB attached DCF77 radio clock
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index a6126eaa0d9..ca0aca8209c 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.21 2008/08/05 22:58:01 miod Exp $
+dnl	$OpenBSD: install,v 1.22 2008/08/06 18:23:56 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -90,23 +90,20 @@ OpenBSDBootMsgs(,"wd0")
 
 OpenBSDInstallPart3
 
-	Next you will have to edit or create a disk label for the disk
-	OpenBSD is being installed on.  If there are any existing
-	partitions defined (for any operating system), and a disk label
-	is not found, you will first be given an opportunity to run
-	fdisk and create an OpenBSD partition.
+	Next you will have to create an OpenBSD partition with fdisk,
+	and then create a disk label within it.
 
-	If fdisk is being invoked on your behalf, it will start by
+	When fdisk is being invoked on your behalf, it will start by
 	displaying the current partitions defined and then allow you
 	to modify this information, add new partitions and change
 	which partition to boot from by default.  If you make a mistake,
 	you will be allowed to repeat this procedure as necessary to
-	correct this.  Note that you should make OpenBSD be the active
-	partition at least until the install has been completed.
+	correct this.  Note that you do not need to make OpenBSD be
+	the active partition.
 
 OpenBSDInstallPart4({:- If you have Linux partitions
 	defined on the disk, these will usually show up as partition
-	'h', 'i' and so on.-:})
+	'i', 'j' and so on.-:})
 
 	One of the three partitions on the Zaurus C3x00 hard drive is
 	a 3GB or 5GB MS-DOS filesystem.  This partition has application
diff --git a/distrib/notes/zaurus/prep b/distrib/notes/zaurus/prep
index 4bc2b357c63..38f8a8eeade 100644
--- a/distrib/notes/zaurus/prep
+++ b/distrib/notes/zaurus/prep
@@ -1,6 +1,6 @@
-dnl	$OpenBSD: prep,v 1.2 2005/01/15 17:52:09 miod Exp $
-To be able to boot the OpenBSD/MACHINE installation program, you will
-need to acquire some limited knowledge of Linux, the low-level
-process that controls the microprocessor after hardware initialization.
-dnl
-dnl XXX bootable partitions
+dnl	$OpenBSD: prep,v 1.3 2008/08/06 18:23:56 miod Exp $
+No specific preparation is required before installing OpenBSD/MACHINE.
+
+However, the installation process will require the data partition to
+be shrunk and recreated; before installing OpenBSD/MACHINE, you should
+make sure any important data on this partition is backed up.