update from netbsd

12 files changed, 32 insertions, 49 deletions

diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 32da106be2a..883db19b6a4 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -102,7 +102,7 @@ begin again from scratch.
 		type:
 			
 			mkdir /mnt/ados
-			mount_ados /dev/sd0d /mnt/ados
+			mount_ados -o ro /dev/sd0d /mnt/ados
 
 		You can use `disklabel sd0' to find out what types
 		of partitions are on the disk `sd0'.
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index 602b2bb18e1..de0edd3f1c1 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -5,28 +5,11 @@ Installation is supported from several media types, including:
 	FTP
 	NetBSD partitions, if doing an upgrade.
 
->>> Transfering install/upgrade file system image to swap partition
-No matter what you do, however, you'll need to have one disk handy,
-on which you will put the install floppy image.
-
-All the images are available from the directory "amiga/floppies",
->>>                                                    ^^^^^^^^
-under the root of the NetBSD tree at your favorite archive site.
-
-If you are using NetBSD/amiga to make the floppies, you should use
-the command dd(1) to write the raw floppy images (.fs files) to
-the disk. To write onto fd0 use:
-
-	dd if=inst-11.fs of=/dev/rfd0a bs=11b
-
-If you are using AmigaDOS to make the floppies, you should
-use the rawwrite utility, provided in the directory
-"amiga/utilities" in the distribution.  To write the image to
-the floppy in df0 use (from cli):
-
-	rawwrite 0 inst-11.fs
->>> fix above to document file system transfer to swap paritition
->>> using xstreamtodev
+The install or upgrade miniroot filesystem needs to be transferred
+to the NetBSD swap partition.  This can be done from AmigaDOS in
+the case of a new install or upgrade, or from NetBSD when doing an
+upgrade.  See the "Preparing your System for NetBSD Installation"
+section for details.
 
 The steps necessary to prepare the distribution sets
 for installation depend on which method of installation
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index 91731a5a0d2..c2601896637 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -11,7 +11,7 @@ Here is a table of recommended HD partition sizes for a full install:
 	Anything else is up to you!
 
 NOTE:  The hp300 installation procedure utilizes a `miniroot' filesystem
-which is placed into the swap area of the disk.  The swap area must be
+which is placed into the swap area of the disk.  The swap are must be
 at least large enough to hold this miniroot image.
 
 The following HP hardware is supported:
diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep
index 3e137c8aa4e..ada1d72e51f 100644
--- a/distrib/notes/hp300/prep
+++ b/distrib/notes/hp300/prep
@@ -27,7 +27,7 @@ calculated with the following formula:
 
 Controllers are numbered 0, 1, ... starting with the lowest select code.
 SCSI controllers and HP-IB controllers are counted separately.  Therefore,
-if you have a system with an internal HP-IB interface at select code 7,
+if you had a system with an internal HP-IB interface at select code 7,
 a fast HP-IB interface at select code 14, and a SCSI interface at select
 code 16, unit numers might be something like the following:
 
@@ -96,10 +96,10 @@ that it resides in a filesystem what is exported to the client.  See the
 manual pages on your server system if you need more information about
 exporting filesystems.
 
-You are now ready to load SYS_INST.  During the client's self-test cycle,
-press the space bar a few times.  Shortly, you should see a menu of possible
-boot options appear.  Select the option corresponding to SYS_INST.  SYS_INST
-will load and prompt you for a command.
+You are now ready to SYS_INST.  During the client's self-test cycle, press
+the space bar a few times.  Shortly, you should see a menu of possible boot
+options appear.  Select the option corresponding to SYS_INST.  SYS_INST will
+load and prompt you for a command.
 
 If this is a new NetBSD installation, you will need to place a disklabel
 on the disk.
diff --git a/distrib/notes/legal.common b/distrib/notes/legal.common
index 5ccc868162b..ed4ba5535e9 100644
--- a/distrib/notes/legal.common
+++ b/distrib/notes/legal.common
@@ -10,10 +10,10 @@
 
 	This product includes software developed by Christian E. Hopps.
 
-	This product includes software developed by Paul Kranenburg.
-
 	This product includes software developed by John Kohl.
 
+	This product includes software developed by Paul Kranenburg.
+
 	This product includes software developed by Terrence R. Lambert.
 
 	This product includes software developed by Frank van der Linden.
diff --git a/distrib/notes/pc532/hardware b/distrib/notes/pc532/hardware
index 1a338056462..d872fe8c5fa 100644
--- a/distrib/notes/pc532/hardware
+++ b/distrib/notes/pc532/hardware
@@ -1,4 +1,4 @@
-NetBSD/pc532 1.0 runs on a PC532 computer.  It supports a subset of the
+NetBSD/pc532 1.1 runs on a PC532 computer.  It supports a subset of the
 "standard" hardware to date.  This is defined as:
 
 	4 - 32 Megs of memory
@@ -7,6 +7,7 @@ NetBSD/pc532 1.0 runs on a PC532 computer.  It supports a subset of the
 		Most SCSI disks work (fixed and floppy)
 		A few SCSI tapes work
 		Some SCSI CD-ROM drives work
+	The Matthias Pfaller Parallel Port.
 
 NetBSD/pc532 currently expects the ROM monitor to be the "autoboot
 monitor" of Oct/Nov 1991.  It includes support to set up auto booting
diff --git a/distrib/notes/pc532/whatis b/distrib/notes/pc532/whatis
index 3399a139941..04d89c1aed6 100644
--- a/distrib/notes/pc532/whatis
+++ b/distrib/notes/pc532/whatis
@@ -9,6 +9,3 @@ For the pc532 port, there are a few known problems.  They include:
 
   d) The disk driver is polled, not interrupt driven.
 
-  e) kernel support for debugging is not working correctly.
-
-  f) shared libraries are not used yet.
\ No newline at end of file
diff --git a/distrib/notes/pc532/xfer b/distrib/notes/pc532/xfer
index a36b90a8c78..8333a1ce8ac 100644
--- a/distrib/notes/pc532/xfer
+++ b/distrib/notes/pc532/xfer
@@ -3,7 +3,9 @@ via the console terminal and using the downloading parts of the
 ROM monitor.  As such, usually another computer has the distribution
 on disk and is connected via a serial line to your pc532's console
 port.  A terminal connected to the attached host computer is used
-to access the pc532 console via a terminal program.  
+to access the pc532 console via a terminal program.  The source for
+a program called download is part of this distribution.  Download
+sends data to the ROM monitor over the serial line.
 
 You may need to find and read the documentation about the ROM monitor
 download command and other low level comands.
@@ -16,4 +18,4 @@ If you have some operating system already running on your pc532,
 you can use that OS to get NetBSD/pc532 on a hard disk much easier than
 with the ROM monitor.  (NetBSD/pc532 was developed from Minix/pc532
 until it was self hosting.  You can run NetBSD and Minix or other OS
-off the same disk.)
\ No newline at end of file
+off the same disk.)
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 267dabfa6f7..8964dd047d8 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,8 +1,8 @@
-The sparc-specific portion of the NetBSD 1.1 release is found in the
+The sparc-specific portion of the NetBSD RELEASE release is found in the
 "sparc" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../NetBSD-1.1/sparc/
+.../NetBSD-RELEASE/sparc/
 			binary/		sparc binary distribution sets;
 					see below.
 
@@ -13,12 +13,12 @@ out as follows:
 					and installation script.
 
 The NetBSD/sparc binary distribution sets contain the binaries which
-comprise the NetBSD 1.1 release for the sparc.  There are seven binary
+comprise the NetBSD RELEASE release for the sparc.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "sparc/binary"
-subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
+subdirectory of the NetBSD RELEASE distribution tree, and are as follows:
 
-	base11	The NetBSD/sparc 1.1 base binary distribution.  You
+	base11	The NetBSD/sparc RELEASE base binary distribution.  You
 		MUST install this distribution set.  It contains the
 		base NetBSD utilities that are necessary for the
 		system to run and be minimally functional.  It
@@ -67,7 +67,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		[ 0.8M gzipped, 3.1M uncompressed ]
 
 The sparc security distribution set is named "secr11" and can be found
-in the "sparc/security" subdirectory of the NetBSD 1.1 distribution
+in the "sparc/security" subdirectory of the NetBSD RELEASE distribution
 tree.  It contains crypt.c (the source file for the DES encryption
 algorithm) and the binaries which depend on it.  It can only be found
 on those sites which carry the complete NetBSD distribution and that
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index d425275cfe8..0a360b8b81a 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,9 +1,9 @@
-NetBSD/sparc 1.1 runs on the following classes of machines:
+NetBSD/sparc RELEASE runs on the following classes of machines:
 	- sun4c (e.g. the SS1, SS1+, SS2, IPC, ELC, IPX, and SLC)
 	- sun4 (e.g. the 4/100, 4/200, and 4/300.   note that support
 		for the 4/400 processor is incomplete)
 
-NetBSD/sparc 1.1 does *not* run on these machines (yet):
+NetBSD/sparc RELEASE does *not* run on these machines (yet):
 	- sun-4/400 (lacking support for the I/O cache, and has
 			ethernet problems)
 	- sun4m (e.g. sparc classic, 4, 5, 10, and 20)
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index eb56c18a544..95bf439d384 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -233,13 +233,13 @@ On version 2 OpenBOOT ROMs:
     ok setenv boot-device /sbus/esp/sd@0,0
 
 
-Congratulations, you have successfully installed NetBSD 1.1.  When you
+Congratulations, you have successfully installed NetBSD RELEASE.  When you
 reboot into NetBSD, you should log in as "root" at the login prompt.
 There is no initial password, but if you're using the machine in a
 networked environment, you should create yourself an account and
 protect it and the "root" account with good passwords.
 
-Some of the files in the NetBSD 1.1 distribution might need to be
+Some of the files in the NetBSD RELEASE distribution might need to be
 tailored for your site.  In particular, the /etc/sendmail.cf file will
 almost definitely need to be adjusted, and other files in /etc will
 probably need to be modified.  If you are unfamiliar with UN*X-like
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
index cbd9dcecc3a..28aadd5331f 100644
--- a/distrib/notes/sparc/whatis
+++ b/distrib/notes/sparc/whatis
@@ -1,5 +1,5 @@
-NetBSD 1.1 is the second release for the sparc. Many more sparc
+NetBSD RELEASE is the second release for the sparc. Many more sparc
 models and devices are now supported.
 In addition to the SunOS 4.1 compatibility present in NetBSD/sparc 1.0,
-version 1.1 will also run some number of SunOS 5 (SVR4) executables
+version RELEASE will also run some number of SunOS 5 (SVR4) executables
 in binary emulation mode.