update from netbsd

20 files changed, 469 insertions, 280 deletions

diff --git a/distrib/amiga/floppies/inst-common/Makefile.inc b/distrib/amiga/floppies/inst-common/Makefile.inc
index b84e5a2356d..028a8c33d16 100644
--- a/distrib/amiga/floppies/inst-common/Makefile.inc
+++ b/distrib/amiga/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.1 1995/10/18 08:37:28 deraadt Exp $
+#	$Id: Makefile.inc,v 1.2 1995/11/28 17:31:49 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -17,10 +17,10 @@ CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
 MTREE=		${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
-	dd if=/dev/zero of=${IMAGE} bs=80k count=22
+	dd if=/dev/zero of=${IMAGE} bs=128k count=32
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	newfs -O -m 0 -o space ${VND_RDEV} floppyhd
-	mount ${VND_DEV} ${MOUNT_POINT}
+	newfs -c 64 -O -m 0 -o space ${VND_RDEV} miniroot
+	mount -t ffs ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list
index 0feda25a64d..aa499121392 100644
--- a/distrib/amiga/floppies/inst-common/list
+++ b/distrib/amiga/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:28 deraadt Exp $
+#	$Id: list,v 1.2 1995/11/28 17:31:51 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -24,6 +24,7 @@ LINK	instbin			bin/[
 LINK	instbin			sbin/disklabel
 LINK	instbin			sbin/fsck
 LINK	instbin			sbin/ifconfig
+LINK	instbin			sbin/halt
 LINK	instbin			sbin/init
 LINK	instbin			sbin/mknod
 LINK	instbin			sbin/mount
diff --git a/distrib/amiga/floppies/inst/list b/distrib/amiga/floppies/inst/list
index 79a711eea49..207025f329f 100644
--- a/distrib/amiga/floppies/inst/list
+++ b/distrib/amiga/floppies/inst/list
@@ -1,8 +1,11 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:28 deraadt Exp $
+#	$Id: list,v 1.2 1995/11/28 17:31:44 deraadt Exp $
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
 
+# copy the kernel
+COPY	${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/netbsd	netbsd
+
 # and the installation tools
 COPY	dot.profile			.profile
 COPY	dot.instutils			.instutils
diff --git a/distrib/amiga/floppies/upgr/list b/distrib/amiga/floppies/upgr/list
index e4a277b4c2a..6d61990e0cb 100644
--- a/distrib/amiga/floppies/upgr/list
+++ b/distrib/amiga/floppies/upgr/list
@@ -1,4 +1,7 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:29 deraadt Exp $
+#	$Id: list,v 1.2 1995/11/28 17:31:55 deraadt Exp $
+
+# copy the kernel
+COPY	${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/netbsd	netbsd
 
 # and the upgrade tools
 COPY	dot.profile			.profile
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 0b71d2e8311..ddd1345cea8 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -17,13 +17,13 @@ as the name implies, is a creation of the members of the network community
 and without the net it's likely that this release wouldn't have come
 about.
 
-NetBSD 1.1 is a evolutionary release which contains a over a year of
+NetBSD 1.1 is a evolutionary release which contains over a year of
 changes to the kernel, user-level utilities, and documentation.
 
 Continuing the multi-platform tradition, NetBSD has added ports to
 atari and mvme68k based machines.  Kernel interfaces have continued to
 be refined, and now several subsystems and device drivers are shared
-among the different ports.  We can look for this trend to continue.
+among the different ports.  You can look for this trend to continue.
 
 NetBSD 1.1 has significantly enhanced the binary emulation subsystem 
 (which includes iBCS2, Linux, OSF/1, SunOS, SVR4, Solaris and Ultrix
@@ -35,10 +35,10 @@ NetBSD 1.1 is also the first release to see machine-independent disk
 striping.  The concatenated disk driver (ccd), which was previously
 supported only by the hp300 port, has been vastly improved.  Many
 bugs were fixed, and explicit references to device-dependent routines
-were removed and replaced by calls to the generic "vnode operation"
+removed and replaced by calls to the generic "vnode operation"
 routines.  In addition, several features were added, including partition
 support, dynamic configuration and unconfiguration via a user space system
-utility program, and virtually unlimiting the number of component devices.
+utility program, and virtually unlimited number of component devices.
 
 Many new user programs have been added in NetBSD 1.1, as well,
 bringing it closer to our goal of supplying a complete UN*X-like
@@ -54,15 +54,15 @@ The Future of NetBSD:
 The NetBSD Foundation was recently incorporated as a non-profit
 organization.  It's purpose is to encourage, foster and promote the
 free exchange of computer software, namely the NetBSD Operating
-System.  The corporation will allow for many things to be handled more
+System.  The foundation will allow for many things to be handled more
 smoothly than could be done with our previous informal organization.
 In particular, it provides the framework to deal with other parties
-that wish to become involved in the NetBSD Project.
+that wish to become involved in the NetBSD Project. (IN WHAT WAY?  Money, donations, etc)
 
 We believe that the NetBSD Foundation will help improve the quality 
 of NetBSD by:
 
-	* having a better organization to keep track of development
+	* providing better organization to keep track of development
 	  efforts, including co-ordination with groups working in 
 	  related fields.
 
@@ -138,35 +138,39 @@ your fault, not ours.
 
 The source distribution sets can be found in subdirectories of the
 "source" subdirectory of the distribution tree.  They contain the 
-complete sources to the system, excluding those portions which should
-not be exported from the U.S.  (Those are contained in each
-architecture's "security" binary distribution set.)  The source
-distribution sets are as follows:
+complete sources to the system.  The source distribution sets 
+are as follows:
+
+	dsrc11	This set contains the "domestic" sources.  These
+		sources contain export-restricted encryption code
+		and should not be exported from the U.S.
+		[ 140K gzipped, 655K uncompressed ]
 
 	gsrc11	This set contains the "gnu" sources, including
 		the source for the compiler, assembler, groff,
 		and the other GNU utilities in the binary distribution
 		sets.
-		[ 7.7M gzipped, 32.0M uncompressed ]
+		[ 7.1M gzipped, 30.4M uncompressed ]
 
 	ksrc11	This set contains the sources to the NetBSD 1.1
 		kernel, config(8), config.old(8) and dbsym(8).
-		[ 4.5M gzipped, 20.8M uncompressed ]
+		[ 6.0M gzipped, 27.0M uncompressed ]
 
 	ssrc11	This set contains the "share" sources, which include
 		the sources for the man pages not associated with
 		any particular program, the sources for the
 		typesettable document set, the dictionaries, and more.
-		[ 2.3M gzipped, 8.5M uncompressed ]
+		[ 2.4M gzipped, 8.9M uncompressed ]
 
 	src11	This set contains all of the NetBSD 1.1 sources which
 		are not mentioned above.
-		[ 7.1M gzipped, 33.4M uncompressed ]
+		[ 9.3M gzipped, 41.6M uncompressed ]
 
 It is worth noting that unless all of the source distribution sets
-are installed, you can't rebuild and install the system from scratch,
-straight out of the box.  However, all that is required to rebuild the
-system in that case is a trivial modification to one Makefile.
+are installed (except the domestic set), you can't rebuild and install
+the system from scratch, straight out of the box.  However, all that is
+required to rebuild the system in that case is a trivial modification 
+to one Makefile.
 
 The source distribution sets are distributed as groups of files named
 "set_name.xx" where "set_name" is the distribution set name, and "xx"
@@ -289,10 +293,10 @@ Also, our thanks go to:
 for answering lots of questions, fixing bugs, and doing the various work
 they've done.
 
-UC Berkeley's Experimental Computing Facility has provided a home for
-sun-lamp, people to look after it, and a sense of humor.  Rob
-Robertson, too, has added his unique sense of humor to things, and for
-a long time provided the primary FTP site for NetBSD.
+UC Berkeley's Experimental Computing Facility provided a home for
+sun-lamp in the past, people to look after it, and a sense of humor.
+Rob Robertson, too, has added his unique sense of humor to things, and
+for a long time provided the primary FTP site for NetBSD.
 
 Without CVS, this project would be impossible to manage, so our hats
 go off to Brian Berliner, Jeff Polk, and the various other people
@@ -348,17 +352,21 @@ Steve Allen		<wormey@eskimo.com>
 John Brezak		<brezak@NetBSD.ORG>
 Dave Burgess		<burgess@cynjut.infonet.net>
 Hubert Feyrer		<hubert.feyrer@rz.uni-regensburg.de>
+Adam Glass		<glass@NetBSD.ORG>
 Brad Grantham		<grantham@tenon.com>
 Matthew Green		<mrg@eterna.com.au>
+Michael L. Hitch	<osymh@gemini.oscs.montana.edu>
 Lawrence Kesteloot	<kesteloo@cs.unc.edu>
 John Kohl 		<jtk@NetBSD.ORG>
 Paul Mackerras	 	<paulus@NetBSD.ORG>
 Neil J. McRae		<neil@domino.org>
+Perry Metzger		<perry@NetBSD.ORG>
 Herb Peyerl		<hpeyerl@beer.org>
 Matthias Pfaller	<leo@marco.de>
 Chris Provenzano	<proven@NetBSD.ORG>
 Waldi Ravens		<waldi@moacs.indiv.nl.net>
 Scott Reynolds		<scottr@edsi.org>
+Thor Lancelot Simon	<tls@netbd.org>
 Wolfgang Solfrank	<ws@tools.de>
 Frank van der Linden	<fvdl@NetBSD.ORG>
 Christos Zoulas 	<christos@NetBSD.ORG>
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 2c728e54e55..b913bb10f13 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -6,8 +6,7 @@ out as follows:
 			binary/		amiga binary distribution sets;
 					see below.
 
-			floppies/	amiga installation and upgrade
->>>                     ^^^^^^^^ should this be miniroot/?
+			miniroot/	amiga installation and upgrade
 					file system images; see below.
 
 			security/	amiga security distribution;
@@ -17,8 +16,7 @@ out as follows:
 					installation utilities; see
 					installation section, below.
 
-There are two amiga file system images to be found in the "amiga/floppy"
->>>                                                              ^^^^^^
+There are two amiga file system images to be found in the "amiga/miniroot"
 subdirectory of the NetBSD 1.1 distribution.  One of them is a upgrade
 image and one is an installation image. They are described in more
 detail below.  There are gzipped versions of each available, for easier
@@ -43,16 +41,16 @@ Upgrade file system:
 
 	This file contains a BSD root file system setup to help
 	you upgrade a previous version of NetBSD.  This includes
-	converting existing partitions
-	and mounting your root and /usr partitions and getting
-	ready to extract (and possibly first fetching) the distribution
-	sets.  There is enough on this file system to allow you to
-	make a slip or ppp connection, configure an ethernet, mount an
-	NFS file system or ftp.  You can also load distribution sets from
-	a SCSI tape, from one of your existing AmigaDOS partitions, or
-	from an existing NetBSD partition.
+	converting existing partitions and mounting your root and
+	/usr partitions and getting ready to extract (and possibly
+	first fetching) the distribution sets.  There is enough on
+	this file system to allow you to make a slip or ppp connection,
+	configure an ethernet, mount an NFS file system or ftp.
+	You can also load distribution sets from a SCSI tape, from
+	one of your existing AmigaDOS partitions, or from an existing
+	NetBSD partition.
 
-	This file is named "inst-11.fs".
+	This file is named "upgr-11.fs".
 
 The NetBSD/amiga binary distribution sets contain the binaries which
 comprise the NetBSD 1.1 release for the amiga.  There are seven binary
@@ -66,8 +64,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		system to run and be minimally functional.  It
 		includes shared library support, and excludes
 		everything described below.
-		[ 7M gzipped, 19M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 7M gzipped, 20M uncompressed ]
 
 	comp11	The NetBSD/amiga Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN (yes, there are two!).
@@ -78,8 +75,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		set).  This set also includes the manual pages for all
 		of the utilities it contains, as well as the system
 		call and library manual pages.
-		[ 4M gzipped, 12M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 5M gzipped, 15M uncompressed ]
 
 	etc11	This distribution set contains the system
 		configuration files that reside in /etc and in several
@@ -88,32 +84,27 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		used if you are upgrading.  (If you are upgrading,
 		it's recommended that you get a copy of this set and
 		CAREFULLY upgrade your configuration files by hand.)
-		[ 50K gzipped, 280K uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 60K gzipped, 340K uncompressed ]
 
 	games11	This set includes the games and their manual pages.
-		[ 1M gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 3M gzipped, 7M uncompressed ]
 
 	man11	This set includes all of the manual pages for the
 		binaries and other software contained in the base set.
 		Note that it does not include any of the manual pages
 		that are included in the other sets.
-		[ 730K gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 850K gzipped, 3M uncompressed ]
 
 	misc11	This set includes the system dictionaries (which are
 		rather large), the typesettable document set, and
 		man pages for other architectures which happen to be
 		installed from the source tree by default.
-		[ 2M gzipped, 6M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 2M gzipped, 7M uncompressed ]
 
 	text11	This set includes NetBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 784K gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The amiga security distribution set is named "secr11" and can be found
 in the "amiga/security" subdirectory of the NetBSD 1.1 distribution
@@ -122,8 +113,7 @@ algorithm) and the binaries which depend on it.  It can only be found
 on those sites which carry the complete NetBSD distribution and that
 can legally obtain it.  (Remember, because of United States law, this
 distribution set may not be exported to locations outside of the
-United States and Canada.)  [ 119K gzipped, 300K uncompressed ]
->>>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+United States and Canada.)  [ 128K gzipped, 307K uncompressed ]
 
 The amiga binary distribution sets are distributed in the same form as
 the source distribution sets; catted together, the members of a set
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 513236ac7cd..9171e41877e 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,7 +1,6 @@
 NetBSD/amiga 1.1 runs on any amiga that has a 68020 or better CPU
 with some form of FPU and MMU.  The minimal configuration requires
 4M of RAM and about 65M 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.  (4M of RAM will actually allow you to
 compile, however it won't be speedy.  X really isn't usable on a
@@ -13,13 +12,16 @@ Here is a table of recommended HD partition sizes for a full install:
 	user (/usr)	65M	100M	45M 	80M
 	swap		----- 2M for every M ram -----
 	local (/local)	up to you
->>> adjust sizes?
+
 
 As you may note the recommended size of /usr is 20M greater than
 needed. This is to leave room for a kernel source and compile tree
 as you will probably want to compile your own kernel. (GENERIC is
 large and bulky to accommodate all people).
 
+If you only have 4M of fast memory, you should make your swap partition
+larger, as your system will be doing much more swapping.
+
 Supported devices include:
 	A4000/A1200 IDE controller.
 	SCSI host adapters:
@@ -34,12 +36,14 @@ Supported devices include:
 		GVP Spectrum.
 		Piccalo.
 		A2410.
+		Cybervision 64.
 	Ethernet controllers:
 		A2065 Ethernet
 		Hydra Ethernet
 		ASDG Ethernet
 		A4066 Ethernet
 		Ariadne Ethernet
+		Quicknet Ethernet
 	Arcnet controllers:
 		A2060 Arcnet
 	Tape drives:
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 5b73f335e75..32da106be2a 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -11,36 +11,48 @@ installed on your hard disk.  If you wish to stop the installation,
 you may hit Control-C at any prompt, but if you do, you'll have to
 begin again from scratch.
 
->>>	transfer installation file system to the swap partition.
->>>	Does this go here, or in the hard disk prep section?
+	Transfer the install miniroot filesystem onto the hard disk
+	partition used by NetBSD for swapping, as described in the
+	"Preparing your System for NetBSD Installation" section above.
+
+	You then need to have "ixemul.library" in your LIBS: directory
+	on AmigaDOS.  You also need to have the "loadbsd" program
+	in your command path.  If AmigaDOS complains about loadbsd
+	not being an executable file, be sure that the "Execute"
+	protection bit is set.  If not, set it with the command:
+		Protect loadbsd add e
 
->>>	Getting loadbsd, ixemul.library, and netbsd onto AmigaDOS
->>>	partition.
 	Next you need to get yourself into NetBSD by loading the
 	kernel from AmigaDOS with loadbsd like so:
 
 		loadbsd -b netbsd
 
+	If you have an AGA machine, and your monitor will handle
+	the dblNTSC mode, you may also include the "-A" option to
+	enable the dblNTSC display mode.
+
 	You should see the screen clear and some information about
 	your system as the kernel configures the hardware.  Note which
 	hard disk device(s) are configured (sd0, sd1, etc).  Then
 	you will be prompted for a root device.  At this time type
-	'sd0*'.
->>>	Need to document what device number to actually use.
+	'sd0*', where '0' is the device which contains the swap
+	partition you created during the hard disk preparation.
 
 	The system should continue to boot.  For now ignore WARNING:
-	messages about bad dates in clocks and swap space.  Eventually
->>>	                                       ^^^^^^^^^^???
-	you will be asked to enter the pathname of the shell, just
-	hit return.  After a short while you should see a welcome
-	message and a prompt, asking if you wish to proceed with the
-	installation.
+	messages about bad dates in clocks.  Eventually you will be
+	asked to enter the pathname of the shell, just hit return.
+	After a short while you should see a welcome message and a
+	prompt, asking if you wish to proceed with the installation.
 
 	If you wish to proceed, enter "y" and then return.
 
 	If you have configured your hard drive[s] correctly it
 	should find the drive and partition that you selected to
-	use as your root.
+	use as your root.  You will be prompted for which device
+	you want to use for your root.  If you have multiple disks
+	present with root partitions defined, you will need to be
+	sure you enter the device name of the correct partition you
+	want to install NetBSD on.
 
 	YOU ARE NOW AT THE POINT OF NO RETURN.  If you confirm that
 	you want to install NetBSD, your hard drive will be modified,
@@ -192,7 +204,6 @@ begin again from scratch.
 		for the installation files.  /mnt/usr/distrib is
 		suggested.
 
->>> Document using ppp or slip?
 		Configure the appropriate ethernet interface i.e. le0
 		if you have a 2065 or ed0 if you have a AMIGNET from
 		Hydra Systems.
@@ -211,6 +222,11 @@ begin again from scratch.
 
 			ifconfig ed0 128.32.240.167 netmask 0xffffff00
 
+		You should also be able to use SLIP or PPP as the network
+		connection.
+		[XXX instructions for ppp or slip would be usefull
+		perhaps the next release]
+
 		If the NFS server or FTP server is not on a directly-
 		connected network, you should set up a route to it
 		with the command:
@@ -267,8 +283,9 @@ network configuration information.
 
 Once you have supplied `Configure' all that it requests, your machine
 will be configured well enough that when you reboot it it will
-almost be a completely functional NetBSD system.  Note you should
-ignore the errors from `chown' they will be corrected shortly.
+almost be a completely functional NetBSD system.
+
+>>> Copy the kernel from the miniroot filesystem at this point <<<
 
 Once you are done with `Configure', halt the system with the "halt"
 command (wait for "halted" to be displayed) and reboot.  Then again
@@ -282,12 +299,6 @@ like so:
 
 	mount -av
 
-Next you need to re-make your devices to get the ownership correct:
-
-	cd /dev
-	MAKEDEV all
->>> Is this step still needed? - check on it!
-
 Your system is now complete but not completely configured; you
 should adjust the /etc/sendmail.cf file as necessary to suit your
 site and/or disable sendmail and other network related programs.
@@ -295,6 +306,15 @@ These things can be found in /etc/netstart.  Use vi, if you installed
 the man pages you can type `man vi' or `man ed' for instructions
 on how to use these somewhat non-intuitive editors.
 
+You should also put a copy of the netbsd kernel in your root partition.
+This can be done easily by mounting the AmigaDOS partition containing
+the kernel you used to start NetBSD and copying the "netbsd" file to
+the root:
+	mount -r -t ados /dev/sd0d /mnt
+	cp /mnt/netbsd /
+(where /dev/sd0d is the AmigaDOS partition where you have netbsd, and
+/mnt/netbsd is the appropriate path of the netbsd file).
+
 Once you are done with the rest of configuration unmount your file
 systems and halt your system, then reboot:
 
@@ -310,5 +330,3 @@ functional:
 
 When it boots off of the hard drive, you will have a complete
 NetBSD system!  CONGRATULATIONS! (You really deserve them!!!)
-
->>> Missing the step to transfer the netbsd kernel to /
diff --git a/distrib/notes/amiga/legal b/distrib/notes/amiga/legal
index 2a4b4e547b6..2fe233811a8 100644
--- a/distrib/notes/amiga/legal
+++ b/distrib/notes/amiga/legal
@@ -1,7 +1,28 @@
+	This product includes software developed by Klaus Burkert.
+
+	This product includes software developed by Michael van Elst.
+
+	This product includes software developed by Bernd Ernesti.
+
+	This product includes software developed by Michael L. Hitch.
+
 	This product includes software developed by Christian E. Hopps.
 
-	This product includes software developed by Timo Rossi
+	This product includes software developed by Mika Kortelainen.
+
+	This product includes software developed by Jukka Marin.
+
+	This product includes software developed by Kari Mettinen.
+
+	This product includes software developed by Brad Pepers.
+
+	This product includes software developed by Ignatios Souvatzis.
+
+	This product includes software developed by Ezra Story.
+
+	This product includes software developed by Lutz Vieweg.
+
+	This product includes software developed by Daniel Widenfalk.
 
-	This product includes software developed by Michael L. Hitch
+	This product includes software developed by Markus Wild.
 
->>> any others?
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 7e7f8c2919d..e7d1f07fd33 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -76,5 +76,46 @@ Preparing you hard disk with HDToolBox:
 	Once this is done NetBSD/amiga will be able to recognize your
 	disks and which partitions it should use.
 
->>> Should the miniroot transfer to the swap partition instructions
->>> go here?
+Transferring the miniroot filesystem:
+
+	The NetBSD/amiga installation or upgrade now uses a "miniroot"
+	fileystem which is installed on the partition used by NetBSD
+	for swapping.  This removes the requirement of using a floppy
+	disk for the filesystem used by the installation or upgrade
+	process.  It also allows more utilities to be present on the
+	filesystem than would be available when using an 880K floppy
+	disk.
+
+	Once the hard disk has been prepared for NetBSD, the appropriate
+	miniroot filesystem (inst-11.fs for a new install or upgr-11.fs
+	for an upgrade) is transferred to the swap partition configured
+	during the hard disk prep (or the existing swap parition in
+	the case of an upgrade).  The xstreamtodev utility provided in
+	the "amiga/utilities" directory can be used on AmigaDOS to
+	transfer the filesystem for either a new installation or an
+	upgrade.  The filesystem can also be transferred on an existing
+	NetBSD system for an update by using dd.  This should only be
+	done after booting NetBSD into single-user state.  It may also
+	be possible to shutdown to single-user, providing that the
+	single-user state processes are not using the swap partition.
+
+	On AmigaDOS, the command:
+		xstreamtodev -input=inst-11.fs -rdb-name=<swap partition>
+	where <swap partition> is the name you gave to the NetBSD
+	partition to be used for swapping.  Use upgr-11.fs if you
+	are going to do an upgrade of an existing NetBSD system.  If
+	xstreamtodev is unable to determine the SCSI driver device
+	name or the unit number of the specified partition, you may
+	also need to include the option "-device=<driver.name>" and/or
+	"-unit=<SCSI unit number>".
+
+	To transfer the miniroot using NetBSD, you should be booted up
+	in single user state on the current NetBSD system, or use the
+	"shutdown now" command to shutdown to single-uyser state.  Then
+	copy the miniroot using dd:
+		dd if=upgr-11.fs of=/dev/rsd0b
+	where /dev/rsd0b should be the device path of the swap partition
+	your system is configured to use.  Once the file is copied,
+	reboot back to AmigaDOS to boot the upgrade kernel.  NOTE:  the
+	release kernel is a "generic" kernel, and requires that the
+	swap partition be on the same device as the root partition.
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index d6fc606e39f..e4afcfaff8b 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -3,22 +3,19 @@ to make users upgrade by compiling and installing the 1.1 sources, and
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.  Because of the various changes to the system,
 the largest being the 64-bit file size support and shared libraries,
->>> just what are the major differences between 1.0 and 1.1??
 it is impractical to upgrade by recompiling from the sources and
 installing.
 
->>>  no kernel-copy!
-To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr-11.fs floppy image on another.  You must
->>>
-also have at least the "base11" binary distribution set available,
-so that you can upgrade with it, using one of the upgrade methods
-described above.  Finally, you must have sufficient disk space
-available to install the new binaries.  Since the old binaries are
-being overwritten in place, you only need space for the new binaries,
-which weren't previously on the system.  If you have a few megabytes
-free on each of your root and /usr partitions, you should have enough
-space.
+To do the upgrade, you must have the NetBSD kernel on AmigaDOS and
+you must transfer the upgrade filesystem upgr-11.fs onto the swap
+partition of the NetBSD hard disk.  You must also have at least the
+"base11" binary distribution set available, so that you can upgrade
+with it, using one of the upgrade methods described above.  Finally,
+you must have sufficient disk space available to install the new
+binaries.  Since the old binaries are being overwritten in place,
+you only need space for the new binaries, which weren't previously
+on the system.  If you have a few megabytes free on each of your
+root and /usr partitions, you should have enough space.
 
 Since upgrading involves replacing the kernel, and most of the system
 binaries, it has the potential to cause data loss.  You are strongly
@@ -28,20 +25,24 @@ beginning the upgrade process.
 
 To upgrade your system, follow the following instructions:
 
->>>	transfer upgrade file system image to swap partition
->>>	should this be in the hard disk prep section?
+	Transfer the upgrade miniroot filesystem onto the hard disk
+	partition used by NetBSD for swapping, as described in the
+	"Preparing your System for NetBSD Installation" section above.
 
-	Boot your machine using of the appropriate kernel-copy floppy.
-	When presented with the boot prompt (the prompt begins with
-	"Boot" and ends with ":-"), hit return.
+	Now boot up NetBSD using the 1.1 kernel using the loadbsd
+	command:
 
-	While booting, you will probably see several warnings.  You
-	should be warned that no swap space is present, and that
->>>                              ^^^^^^^^^^^^^^^^^^^^^
-	init(8) cannot find /etc/rc.  Do not be alarmed, these are
->>>     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-	completely normal.  When you reach the prompt asking you for a
-	shell name, just hit return.
+		loadbsd -b netbsd
+
+	You should see the screen clear and some information about
+	your system as the kernel configures the hardware.  Note which
+	hard disk device is configured that contains your root and
+	swap partition.  When prompted for the root device, type
+	'sd0*' (replacing 0 with the disk number that NetBSD used for
+	your root/swap device).  The '*' character indicates that the
+	root filesystem is contained on the swap partition.
+	When you reach the prompt asking you for a shell name, just
+	hit return.
 
 	You will be presented with some information about the upgrade
 	process and a warning message, and will be asked if you wish
@@ -59,9 +60,6 @@ To upgrade your system, follow the following instructions:
 	probably do it manually after the install process is complete,
 	by using "fsck -c 2". Read the fsck(8) manual page for more
 	details.
->>>  Is this needed for 1.0 to 1.1 upgrade?  Or mention that the upgrade
->>>  should be done if it wasn't previously done?  [It shouldn't hurt
->>>  to run through the upgrade steps.]
 
 	The upgrade program will then check your root file system,
 	and, if you approved, will upgrade it to the new file system
@@ -78,7 +76,6 @@ To upgrade your system, follow the following instructions:
 	If you don't already have the NetBSD distribution sets on your
 	disk, look in the installation section for information on how
 	to transfer them to your disk.
->>> NetBSD or AmigaDOS partitions...
 
 	Once the distribution sets are transferred to your disk,
 	continue here.  (Obviously, if the NetBSD distribution sets
@@ -113,8 +110,9 @@ To upgrade your system, follow the following instructions:
 	up the installation, by remaking some system databases.  When
 	it is complete, you should use "halt" to halt the system.
 
->>>	transfer new kernel to /
-
+	You will probably also want to copy the release "netbsd" kernel
+	image to your root at some point.
+	
 Your system has now been upgraded to NetBSD 1.1.
 
 After a new kernel has been copied to your hard disk, your
@@ -150,7 +148,6 @@ After a new kernel has been copied to your hard disk, your
 	NFS.  (Note that the information for mounts of type "ufs",
 	i.e. Fast File Systems, are contained in the mount(8) man
 	page.)
->>> Is this needed for 1.0 -> 1.1 upgrade?
 
 	Finally, you will want to delete old binaries that were part
 	of the version of NetBSD that you upgraded from and have since
diff --git a/distrib/notes/amiga/whatis b/distrib/notes/amiga/whatis
index bff5272d6c1..6633cbe79b0 100644
--- a/distrib/notes/amiga/whatis
+++ b/distrib/notes/amiga/whatis
@@ -1,4 +1,5 @@
 
->>> What should go here?
-This is the first public release of NetBSD for the Amiga line of
-computers.
+This is the second public release of NetBSD for the Amiga line of
+computers.  Several additional graphics and network boards are now
+supported.  Some of the SCSI drivers have been enhanced and (hopefully)
+improved.
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index b8abea2173e..0c3108e2417 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,8 +1,8 @@
-The i386-specific portion of the NetBSD 1.0 release is found in the
+The i386-specific portion of the NetBSD 1.1 release is found in the
 "i386" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../NetBSD-1.0/i386/
+.../NetBSD-1.1/i386/
 			INSTALL		Installation notes; this file.
 
 			binary/		i386 binary distribution sets;
@@ -19,7 +19,7 @@ out as follows:
 					installation section, below.
 
 There are four i386 floppy images to be found in the "i386/floppy"
-subdirectory of the NetBSD 1.0 distribution.  Two of them are bootable
+subdirectory of the NetBSD 1.1 distribution.  Two of them are bootable
 kernel-copy floppies, one is an installation floppy, and one is an
 upgrade floppy.  They are all described in more detail below.  There
 are gzipped versions of each available, for easier downloading.  (The
@@ -36,41 +36,64 @@ Bootable Kernel-copy floppies:
 	disk.
 
 	There are two different kernel copy floppy images,
-	"kcaha-10.fs", and "kcbt-10.fs".  They are identical except
-	that the first has the driver for the Adaptec 1542 SCSI host
-	adapter and does not contain the driver for the Buslogic 74x
-	SCSI host adapters, and vice-versa for the second.  (All other
-	drivers are present on both disks.)
+        "kcadp11.fs", and "kcoth11.fs".  They are identical except
+        that the kcadp floppy has the drivers for the supported Adaptec SCSI
+        controllers -- the Adaptec 1520, 1522, 1540, 1542, 1740, 1742, 1744,
+        and 2940 SCSI host adapters and the AIC6x60 and AIC7870 chips on 
+	motherboards or other brands of SCSI controllers -- and does not
+        contain the drivers for any other SCSI host adapters, which
+        are in the kernel on the kcoth floppy.  (The kernels on the install
+        disks are otherwise identical.)
+
+        Please note that because of space considerations the kernel
+        copy floppies no longer contain drivers that are not needed
+        during installation -- in particular, no drivers needed to run
+        the X Window System are available in these kernels. It is
+        recommended that you configure a custom kernel following
+        installation.
+
+        For those that cannot configure a custom kernel, two "generic"
+        kernel images, named "netbsd-adp.gz" and "netbsd-oth.gz", have
+        been placed in the binaries directory. These are identical
+        except that "netbsd-adp.gz" contains support for Adaptec SCSI
+        controllers, but no other SCSI controllers, and
+        "netbsd-oth.gz" contains support only for SCSI controllers
+        other than the Adaptec. (These are similar in nature to the
+        kernels on the kernel copy floppies but with additional device
+        support.) It is strongly encouraged that you build a custom
+        kernel for your installation rather than use a prebuilt generic
+        kernel.
+        
 
 Installation floppy:
 
 	This disk contains the software necessary to prepare your hard
 	drive for NetBSD and install the NetBSD distribution. It is
 	not bootable, and must be used in conjunction with one of the
-	kernel-copy floppies.  This floppy is named "inst-10.fs".
+	kernel-copy floppies.  This floppy is named "inst-11.fs".
 
 Upgrade floppy:
 
 	This disk contains the software to be used in upgrading the
 	system from a previous version of NetBSD.  It is not bootable,
 	and must be used in conjunction with one of the kernel-copy
-	floppies.  This floppy is named "upgr-10.fs"
+	floppies.  This floppy is named "upgr11.fs"
 
 The NetBSD/i386 binary distribution sets contain the binaries which
-comprise the NetBSD 1.0 release for the i386.  There are seven binary
+comprise the NetBSD 1.1 release for the i386.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "i386/binary"
-subdirectory of the NetBSD 1.0 distribution tree, and are as follows:
+subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 
-	base10	The NetBSD/i386 1.0 base binary distribution.  You
+	base11	The NetBSD/i386 1.1 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
 		includes shared library support, and excludes
 		everything described below.
-		[ 6.2M gzipped, 16.7M uncompressed ]
+		[ 7.5M gzipped, 19.5M uncompressed ]
 
-	comp10	The NetBSD/i386 Compiler tools.  All of the tools
+	comp11	The NetBSD/i386 Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN (yes, there are two!).
 		This set includes the system include files
 		(/usr/include), the linker, the compiler tool chain,
@@ -79,45 +102,49 @@ subdirectory of the NetBSD 1.0 distribution tree, and are as follows:
 		set).  This set also includes the manual pages for all
 		of the utilities it contains, as well as the system
 		call and library manual pages.
-		[ 4.2M gzipped, 12.9M uncompressed ]
+		[ 4.9M gzipped, 15.0M uncompressed ]
 
-	etc10	This distribution set contains the system
+	etc11	This distribution set contains the system
 		configuration files that reside in /etc and in several
 		other places.  This set MUST be installed if you are
 		installing the system from scratch, but should NOT be
 		used if you are upgrading.  (If you are upgrading,
 		it's recommended that you get a copy of this set and
 		CAREFULLY upgrade your configuration files by hand.)
-		[ 50K gzipped, 263K uncompressed ]
+		[ 63K gzipped, 338K uncompressed ]
 
-	games10	This set includes the games and their manual pages.
-		[ 1.0M gzipped, 2.7M uncompressed ]
+	games11	This set includes the games and their manual pages.
+		[ 2.8M gzipped, 6.9M uncompressed ]
 
-	man10	This set includes all of the manual pages for the
+	man11	This set includes all of the manual pages for the
 		binaries and other software contained in the base set.
 		Note that it does not include any of the manual pages
 		that are included in the other sets.
-		[ 0.7M gzipped, 2.8M uncompressed ]
+		[ 0.8M gzipped, 3.4M uncompressed ]
 
-	misc10	This set includes the system dictionaries (which are
+	misc11	This set includes the system dictionaries (which are
 		rather large), the typesettable document set, and
 		man pages for other architectures which happen to be
 		installed from the source tree by default.
-		[ 1.6M gzipped, 5.6M uncompressed ]
+		[ 1.9M gzipped, 6.6M uncompressed ]
 
-	text10	This set includes NetBSD's text processing tools,
+	text11	This set includes NetBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
-		[ 0.8M gzipped, 2.8M uncompressed ]
+		[ 0.8M gzipped, 2.9M uncompressed ]
 
-The i386 security distribution set is named "secr10" and can be found
-in the "i386/security" subdirectory of the NetBSD 1.0 distribution
+The i386 security distribution set is named "secr11" and can be found
+in the "i386/security" subdirectory of the NetBSD 1.1 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
-can legally obtain it.  (Remember, because of United States law, this
-distribution set may not be exported to locations outside of the
-United States and Canada.)  [ 114K gzipped, 253K uncompressed ]
+algorithm) and the binaries which depend on it, as well as the "bdes"
+DES encryption program.  You do not need this distribution set to use
+encrypted passwords in your password file; the "base11" distribution
+includes a crypt library which can perform only the decryption function.
+The "secr11" distribution set can be found only on those sites which
+carry the complete NetBSD distribution and which can legally obtain it.
+(Remember, because of United States law, this distribution set may not be
+exported to locations outside of the United States and Canada.)
+	[ 154K gzipped, 358K uncompressed ]
 
 The i386 binary distribution sets are distributed in the same form as
 the source distribution sets; catted together, the members of a set
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 3e4ffa70274..75576c9d186 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,8 +1,9 @@
-NetBSD/i386 1.0 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
+NetBSD/i386 1.1 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
 with 386-family processors, with or without math coprocessors.  It
 does NOT support MCA systems, such as some IBM PS/2 systems.  The
-minimal configuration requires 4M of RAM and 40M of disk space.  To
-install the entire system requires much more disk space, and to run X
+minimal configuration is said to require 4M of RAM and 50M of disk space,
+though we do not know of anyone running with a system quite this minimal today.
+To install the entire system requires much more disk space, and to run X
 or compile the system, more RAM is recommended.  (4M of RAM will
 actually allow you to run X and/or compile, but it won't be speedy.
 Note that until you have around 16M of RAM, getting more RAM is more
@@ -12,17 +13,30 @@ Supported devices include:
 	Floppy controllers.
 	MFM, ESDI, IDE, and RLL hard disk controllers.
 	SCSI host adapters:
-		Adaptec AHA-154xA, -B, -C, and -CF [only on kcaha floppy]
+			[Adaptec host adapters only on kcadp floppy]
+		Adaptec AHA-154xA, -B, -C, and -CF 
 		Adaptec AHA-174x
-		Adaptec AIC-6260- and AIC-6360-based boards, including
+		Adaptec AIC-6260 and AIC-6360 based boards, including
 			the Adaptec AHA-152x and the SoundBlaster SCSI
 			host adapter.  (Note that you cannot boot from
-			these boards if they do not have a boot ROM,
-			and many do not.)
-		Buslogic 54x [AHA-154x clones; only on kcaha floppy]
-		Buslogic 445, 74x, 9xx [only on kcbt floppy]
-		NCR 53C810 PCI SCSI host adapter
+			these boards if they do not have a boot ROM;
+			only the AHA-152x and motherboards using this chip
+			are likely to be bootable, consequently.)
+		Adaptec AHA-294x[W] cards and some onboard PCI designs using
+			the AIC7870 chip.  This driver does *not* currently
+			work with non-PCI AIC-7xxx boards or the Adaptec 3940.
+		Buslogic 54x (Adaptec AHA-154x clones; driver on kcadp floppy)
+
+			[Other host adapters only on kcoth floppy]
+		BusLogic 445, 74x, 9xx  (But not the new "FlashPoint" series
+			of BusLogic SCSI adapters)
+		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 		Ultrastor 14f, 34f, and (possibly) 24f
+		Seagate/Future Domain ISA SCSI adapter cards, including
+			ST01/02
+			Future Domain TMC-885
+			Future Domain TMC-950
+
 	MDA, CGA, VGA, SVGA, and HGC Display Adapters.  (Note that not
 		all of the display adapters NetBSD/i386 can work with
 		are supported by X.  See the XFree86 FAQ for more
@@ -31,35 +45,56 @@ Supported devices include:
 		8250/16450-based ports
 		16550-based ports
 		AST-style 4-port serial boards [*]
+		BOCA 8-port serial cards [*] 
+		Cyclades Cyclom-{4, 8, 16}Y serial boards [*]
 		IBM PC-RT 4-port serial boards [*]
 	Parallel ports.
-	Ethernet controllers:
+	Ethernet adapters:
+		AMD LANCE and PCnet-based ISA Ethernet adapters [*], including:
+			Novell NE1500T
+			Novell NE2100
+			Kingston 21xx
+		AMD PCnet-based PCI Ethernet adapters, including:
+			BOCALANcard/PCI
 		AT&T StarLAN 10, EN100, and StarLAN Fiber
-		3COM 3c501 [*]
+		3COM 3c501
 		3COM 3c503
 		3COM 3c505 [*]
 		3COM 3c507
-		3COM 3c509 and 3c579
-		Digital DEPCA [*]
+		3COM 3c509 and 3c579 (But not the PCI 3c59X series)
+		Digital DC21x4x-based PCI Ethernet adapters, including:
+			SMC EtherPower 10, 10/100 (PCI only!)
+			Znyx ZX34X
+			Cogent EM100
+			Digital DE450
+			Digital DE500
 		BICC Isolan [* and not recently tested]
+		Intel EtherExpress 16
 		SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards
 		SMC/WD 8216 (the SMC "Elite16 Ultra" ISA boards)
 		Novell NE1000, NE2000
-		Novell NE2100 [* and not recently tested]
 	Tape drives:
 		Most SCSI tape drives
 		QIC-02 and QIC-36 format (Archive- and Wangtek-
-			compatible) tape drives [*]
+			compatible) tape drives [*] [+]
 	CD-ROM drives:
-		Mitsumi CD-ROM drives [*]
+		Mitsumi CD-ROM drives [*] [+]
+			[Note: The Mitsumi driver device probe is known 
+			to cause trouble with several devices!]
 		Most SCSI CD-ROM drives
 	Mice:
-		"Logitech"-style bus mice [*]
-		"Microsoft"-style bus mice [*]
-		"PS/2"-style mice [*]
+		"Logitech"-style bus mice [*] [+]
+		"Microsoft"-style bus mice [*] [+]
+		"PS/2"-style mice [*] [+]
 		Serial mice (no kernel support necessary)
+	Sound Cards:
+		SoundBlaster [*] [+]
+		Gravis Ulrasound and Ultrasound Max [*] [+]
+			[The following drivers are not extensively tested]
+		Personal Sound System [*] [+]
+		Windows Sound System [*] [+]
+		ProAudio Spectrum [*] [+]
 	Miscellaneous:
-		SoundBlaster [*]
 
 Drivers for hardware marked with "[*]" are NOT included on the
 distribution floppies.  Except as noted above, all other drivers are
@@ -69,18 +104,31 @@ NetBSD normally allows more, though, so if you have more than one, you
 can use all of them by compiling a custom kernel once NetBSD is
 installed.
 
+Support for devices marked with "[+]" IS included in the "generic" kernels,
+although it is not in the kernels which are on the distribution floppies.
+
+
 Hardware the we do NOT currently support, but get many questions
 about:
 	Adaptec AIC-7770-based SCSI host adapters (including the
-		Adaptec AHA-274x, AHA-284x, and AHA-294x families).
-	Intel EtherExpress Ethernet boards.
+		Adaptec AHA-274x, AHA-284x families).
 	NCR 5380-based SCSI host adapters.
-	PCMCIA devices.
+	APM power management -- if your system supports it, turn it off!
+	PCMCIA ("PC Card") devices, including some miniature "IDE" hard disks.
 	QIC-40 and QIC-80 tape drives.  (Those are the tape drives
 		that connect to the floppy disk controller.)
 	WD-7000 SCSI host adapters.
-
-We are planning future support for most of these devices.
+	PCI-PCI bridges and cards which include them, such as the AHA-394x
+		SCSI host adapter and some DC21x4x-based multi-Ethernet cards.
+	3Com 3c59x series PCI Ethernet and Fast Ethernet adapters.
+	Multiprocessor Pentium and Pentium Pro systems.  (Though they should
+		run fine using one processor only.)
+	Intel EtherExpress 100 Fast Ethernet adapters.
+	Digital DEFPA PCI FDDI adapters (support barely missed this release;
+		it works in other ports, and will work in this one in the
+		next release)
+
+We are planning future support for many of these devices.
 
 To be detected by the distributed kernels, the devices must
 be configured as follows:
@@ -102,22 +150,22 @@ Floppy controller
 		fdc0	0x3f0	6	2	[supports two disks]
 
 AHA-154x, AHA-174x (in compatibility mode), or BT-54x SCSI host adapters
-		aha0	0x330	any	any	[only on kcaha kernel floppy]
+		aha0	0x330	any	any	[only on kcadp kernel floppy]
 
 AHA-174x SCSI host adapters (in enhanced mode)
-		ahb0	any	any	any
+		ahb0	any	any	any	[only on kcadp kernel floppy]
 
 BT445, BT74x, or BT9xx SCSI host adapters
-		bt0	0x330	any	any	[only on kcbt kernel floppy]
+		bt0	0x330	any	any	[only on kcoth kernel floppy]
 
 Ultrastor 14f, 24f (if it works), or 34f SCSI host adapters
-		uha0	0x330	any	any
+		uha0	0x330	any	any	[only on kcoth kernel floppy]
 
 AHA-152x, AIC-6260- or AIC-6360-based SCSI host adapters
-		aic0	0x340	11	6
+		aic0	0x340	11	6	[only on kcadp kernel floppy]
 
-NCR 53C810 PCI SCSI host adapter
-		ncr0	any	any	any
+Symbios Logic/NCR 53C8xx based PCI SCSI host adapters
+		ncr0	any	any	any	[only on kcoth kernel floppy]
 
 SCSI disks	sd0	first SCSI disk (by SCSI id)
 		sd1	second SCSI disk (by SCSI id)
@@ -141,3 +189,11 @@ Novell NE1000, or NE2000 Ethernet boards
 
 AT&T StarLAN 10, EN100, or StarLAN Fiber, or 3COM 3c507 Ethernet boards
 		ie0	0x360	7		iomem 0xd0000
+
+PCNet-PCI based Ethernet boards; see above for partial list
+		le0	any	any	[you must assign an interrupt in your
+					 PCI BIOS, or let it do so for you]
+
+DC21x4x based Ethernet boards; see above for partial list
+		de0	any	any 	[you must assign an interrupt in your
+					 PCI BIOS, or let it do so for you]
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 6a62923824f..5c9fee5ea2e 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -56,7 +56,7 @@ process again from scratch.
 
 	Once you have reached that prompt, remove the kernel-copy
 	floppy from the floppy drive.  Make sure that the installation
-	disk (the "inst-10" floppy) is writable, insert it into the
+	disk (the "inst-11" floppy) is writable, insert it into the
 	floppy drive, and hit any key.
 
 	You will then be presented with the NetBSD kernel boot
@@ -223,12 +223,12 @@ process again from scratch.
 
 		Run the "Extract" command once for each distribution
 		set you wish to install.  For instance, if you wish to
-		install the "base10" distribution set, followed by the
-		"man10" distribution set, and finally the "etc10"
+		install the "base11" distribution set, followed by the
+		"man11" distribution set, and finally the "etc11"
 		distribution set, use the commands:
-			Extract base10
-			Extract man10
-			Extract etc10
+			Extract base11
+			Extract man11
+			Extract etc11
 
 		For each extraction, it will ask you if the extraction
 		should be verbose.  If you reply affirmatively, it
@@ -283,9 +283,9 @@ process again from scratch.
 		hitting return at the prompt.
 
 		Use the "Extract" command to extract the distribution
-		set.  For instance, if you're extracting the "base10"
+		set.  For instance, if you're extracting the "base11"
 		set, use the command:
-			Extract base10
+			Extract base11
 		You will be asked if you wish the extraction to be
 		verbose.  If you reply affirmatively, the name of each
 		file being extracted will be printed.
@@ -403,7 +403,7 @@ process again from scratch.
 	Once you have finished extracting all of the distribution sets
 	that you wish to install, and are back at the "#" prompt, you
 	are ready to configure your system.  The configuration utility
-	expects that you have installed the "base10" and "etc10"
+	expects that you have installed the "base11" and "etc11"
 	distribution sets.  If you have not, you will not be able to
 	run it successfully (nor will you have a functional system, in
 	any case).  To configure your newly-installed NetBSD system,
@@ -415,8 +415,8 @@ process again from scratch.
 Kernel Installation:
 
 	Enter "halt" at the prompt to halt the system.  When the
-	system is halted, remove the "inst-10" floppy from the floppy
-	drive, and replace it with the NetBSD 1.0 kernel-copy floppy
+	system is halted, remove the "inst-11" floppy from the floppy
+	drive, and replace it with the NetBSD 1.1 kernel-copy floppy
 	that you previously booted from.  Reboot with that floppy.
 	with that floppy.
 
@@ -445,13 +445,13 @@ Kernel Installation:
 	Once the system is halted, remove the kernel-copy floppy from
 	the floppy disk drive, and hit any key to reboot.
 
-Congratulations, you have successfully installed NetBSD 1.0.  When you
+Congratulations, you have successfully installed NetBSD 1.1.  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.0 distribution might need to be
+Some of the files in the NetBSD 1.1 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, as well.  If you are unfamiliar with
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index d926ee2ce54..b7b93a8166e 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -15,18 +15,33 @@ Second, if you are using a disk controller which supports disk
 geometry translation, be sure to use the same parameters for NetBSD as
 for DOS or the other operating systems installed on your disk.  If you
 do not, it will be much harder to make NetBSD properly coexist with
-them.
+them.  Utilities exist which will print out the disk geometry which DOS
+sees; some versions of DOS "fdisk" also do this.  If you have an "EIDE"
+hard disk, DOS and NetBSD probably won't see the same geometry, and you
+must be careful to find out the DOS geometry and tell NetBSD about it
+during the installation.
 
-Third, use the DOS "fdisk" program or another partition editor to
+Third (but related to the second point above), if you are using a hard
+disk with more sectors than DOS or your controller's BIOS supports without
+some kind of software translation utility or other kludge, you MUST
+BE SURE that all partitions which you want to boot from must start below
+cylinder 1024 by the BIOS's idea of the disk, and that all DOS partitions
+MUST EXIST ENTIRELY BELOW cylinder 1024, or you will either not be able to
+boot NetBSD, not be able to boot DOS, or you may experience data loss or
+filesystem corruption.  Be sure you aren't using geometry translation that
+you don't know about, but that the DOS "fdisk" program does!
+
+Fourth, use the DOS "fdisk" program or another partition editor to
 repartition your hard disk.  Create a partition of at least 40M in
-size, and note its starting offset and its length (preferably in units
-of disk sectors or cylinders).  You will need that information when
-installing NetBSD (and if the offset and length are not in those
-units, you will have to convert them).  Once you have created the new
-NetBSD partition, mark it as having a partition type of 0xA5 (165, in
-decimal).  If you used "fdisk" to partition your disk, you will
-probably have to use a different partition editor to mark the
-partition with the correct type.
+size (preferably much larger), and note its starting offset and its
+length (preferably in units of disk sectors or cylinders).  You will
+need that information when installing NetBSD (and if the offset and
+length are not in those units, you will have to convert them).  Once
+you have created the new NetBSD partition, mark it as having a
+partition type of 0xA5 (165, in decimal).  If you used "fdisk" to
+partition your disk, you will probably have to use a different
+partition editor to mark the partition with the correct type.
+
 
 Finally, do whatever is necessary to restore order to the partition
 you took space away from.  If it was a DOS partition, you probably
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 719149c224a..1755622a6ea 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -1,14 +1,13 @@
-The upgrade to NetBSD 1.0 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 1.0 sources, and
+The upgrade to NetBSD 1.1 is a binary upgrade; it would be prohibitive
+to make users upgrade by compiling and installing the 1.1 sources, and
 it would be very difficult to even compile a set of instructions that
-allowed them to do so.  Because of the various changes to the system,
-the largest being the 64-bit file size support and shared libraries,
-it is impractical to upgrade by recompiling from the sources and
-installing.
+allowed them to do so.  Because of the many changes to the system, it
+is difficult impractical to upgrade by recompiling from the sources
+and installing.
 
 To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr-10.fs floppy image on another.  You must
-also have at least the "base10" binary distribution set available,
+image on a disk, and the upgr11.fs floppy image on another.  You must
+also have at least the "base11" binary distribution set available,
 so that you can upgrade with it, using one of the upgrade methods
 described above.  Finally, you must have sufficient disk space
 available to install the new binaries.  Since the old binaries are
@@ -31,7 +30,7 @@ To upgrade your system, follow the following instructions:
 	"Boot" and ends with ":-"), hit return.
 
 	You will be prompted to insert a file system floppy.  Remove
-	the kernel-copy floppy and insert the upgr-10 floppy, then hit
+	the kernel-copy floppy and insert the upgr11 floppy, then hit
 	any key to continue booting.
 
 	While booting, you will probably see several warnings.  You
@@ -55,7 +54,8 @@ To upgrade your system, follow the following instructions:
 	If you don't have your file systems upgraded now, you should
 	probably do it manually after the install process is complete,
 	by using "fsck -c 2". Read the fsck(8) manual page for more
-	details.
+	details. Note that this step is only important when upgrading
+        from a pre-NetBSD 1.0 release.
 
 	The upgrade program will then check your root file system,
 	and, if you approved, will upgrade it to the new file system
@@ -91,13 +91,13 @@ To upgrade your system, follow the following instructions:
 
 	After the software has been transferred to the machine (or
 	mounted, in the case of upgrading via NFS), change into the
-	directory containing the "base10" distribution set.  Once you
+	directory containing the "base11" distribution set.  Once you
 	are there, run the "Set_tmp_dir" command, and hit return at
 	the prompt to select the default answer for the temporary
 	directory's path name.  (It should be the path name of the
 	directory that you're in.)
 
-	Run the command "Extract base10" to upgrade the base
+	Run the command "Extract base11" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -116,8 +116,8 @@ To upgrade your system, follow the following instructions:
 	up the installation, by remaking some system databases.  When
 	it is complete, you should use "halt" to halt the system.
 
-	When the system is halted, remove the "upgr-10" floppy from
-	the floppy drive, and replace it with the NetBSD 1.0
+	When the system is halted, remove the "upgr11" floppy from
+	the floppy drive, and replace it with the NetBSD 1.1
 	kernel-copy floppy that you previously booted from. Reboot
 	with that floppy.
 
@@ -146,20 +146,21 @@ To upgrade your system, follow the following instructions:
 	Once the system is halted, remove the kernel-copy floppy from
 	the floppy disk drive, and hit any key to reboot.
 
-Your system has now been upgraded to NetBSD 1.0.
+Your system has now been upgraded to NetBSD 1.1.
 
-After a new kernel has been copied to your hard disk, your
-	machine is a complete NetBSD 1.0 system.  However, that
+        After a new kernel has been copied to your hard disk, your
+	machine is a complete NetBSD 1.1 system.  However, that
 	doesn't mean that you're finished with the upgrade process.
 	There are several things that you should do, or might have to
 	do, to insure that the system works properly.
 
 	First, if you did not upgrade your file systems to the new
-	file system format during the upgrade process, you may want to
-	do so now, with "fsck -c 2".  If you are unsure about the
-	process, it's suggested that you read the fsck(8) manual page.
+	file system format during the upgrade process, and you are
+        upgrading from a pre-1.0 NetBSD, you may want to do so now,
+        with "fsck -c 2".  If you are unsure about the process, it's
+        suggested that you read the fsck(8) manual page.
 
-	Second, you will probably want to get the etc10 distribution,
+	Second, you will probably want to get the etc11 distribution,
 	extract it, and compare its contents with those in your /etc/
 	directory.  You will probably want to replace some of your
 	system configuration files, or incorporate some of the changes
@@ -175,16 +176,18 @@ After a new kernel has been copied to your hard disk, your
 	some of the configuration files.  The most notable change is
 	that the "options" given to many of the file systems in
 	/etc/fstab or by hand have changed, and some of the file
-	systems have changed names.  To find out what the new options
-	are, it's suggested that you read the manual page for the
-	file systems' mount commands, for example mount_nfs(8) for
-	NFS.  (Note that the information for mounts of type "ufs",
+	systems have changed names. *IMPORTANT*: ANY INSTANCES OF "ufs"
+        IN /etc/fstab MUST BE CHANGED TO "ffs".  To find out what the
+        new options are, it's suggested that you read the manual page
+        for the file systems' mount commands, for example mount_nfs(8)
+        for NFS.  (Note that the information for mounts of type "ffs",
 	i.e. Fast File Systems, are contained in the mount(8) man
 	page.)
 
 	Finally, you will want to delete old binaries that were part
 	of the version of NetBSD that you upgraded from and have since
-	been removed from the NetBSD distribution.  You might also
+	been removed from the NetBSD distribution.  If you are
+        upgrading from a pre-1.0 NetBSD, you might also
 	want to recompile any locally-built binaries, to take
 	advantage of the shared libraries.  (Note that any new
 	binaries that you build will be dynamically linked, and
diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis
index d622f17d6a7..a33e11820a7 100644
--- a/distrib/notes/i386/whatis
+++ b/distrib/notes/i386/whatis
@@ -1,9 +1,13 @@
-For the i386, NetBSD 1.0 brings greatly improved performance, stability,
-and device support.  To complement the added device drivers, NetBSD
-1.0's i386 port has greatly improved device autoconfiguration,
-allowing it to correctly find more devices on more machines.  The
-final, and perhaps most important point about NetBSD 1.0's i386
-support is that it is fully backward compatible with old NetBSD
-binaries, so you don't need to recompile all your local programs.
-(Note, however, that because of the shared library support, you still
-have a lot to gain by doing so.)
+For the i386, NetBSD 1.1 brings greatly improved performance,
+stability, and device support. Emulation for several UN*X and UN*X
+like operating systems, including Linux and FreeBSD, has been added.
+Many new PCI devices are supported, such as cards based on the AMD
+PCnet-PCI Ethernet chip, the Digital DC21x4x family of Ethernet chips,
+and the Adaptec AIC7870 SCSI host adapter chip.  Some drivers such as
+"ccd" which previously only worked on other ports of NetBSD now work
+on the i386 port.  Though still not known to be entirely stable, the
+"ncr" driver for 53c8xx-series SCSI adapters has had substantial bugs
+and performance issues resolved.
+
+NetBSD 1.1 on i386 is also fully backward compatible with old NetBSD
+i386 binaries, so you don't need to recompile all your local programs.
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index 41cfdeccfe1..587423b3b05 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -6,19 +6,16 @@ Installation is supported from several media types, including:
 	FTP
 
 No matter which installation medium you choose, you'll need to have
-two floppy disks available (either 1.2M or 1.44 will work, though
-both should be the same type).  On the first, you'll put the
-kernel-copy image that's appropriate for your system.  On the second,
-you'll put the install or upgrade floppy image, depending on whether
-you're installing NetBSD for the first time, or upgrading a previous
-installation.
-
-If you are using an Adaptec AHA-154x or Buslogic BT-54x SCSI host
-adapter, you need the kcaha-10.fs kernel-copy image.  If you're using
-a Buslogic BT-445, BT-74x, or BT-9xx SCSI host adapter, you'll need
-the kcbt-10.fs image.  If you're using a disk controller other than
-those mentioned above, either kernel-copy disk image will work for
-you.
+two floppy disks (either 1.2M or 1.44 will work, though both should be
+the same type).  On the first, you'll put the kernel-copy image that's
+appropriate for your system.  On the second, you'll put the install or
+upgrade floppy image, depending on whether you're installing NetBSD
+for the first time, or upgrading a previous installation.
+
+If you are using an Adaptec SCSI host adapter, you need the kcadp11.fs
+kernel-copy image.  If you're using any other SCSI host adapter,
+you'll need the kcoth11.fs image.  If you're using a non-SCSI disk
+controller, either kernel-copy disk image will work for you.
 
 If you are using a UN*X-like system to write the floppy images to
 disks, you should use the "dd" command to copy the file system images
@@ -93,14 +90,14 @@ following:
 	(If you can't figure it out, ask your system administrator.)
 	In the above example, "<dist_directories>" are the
 	distribution sets' directories, for the distribution sets you
-	wish to place on the tape.  For instance, to put the "base10"
-	and "etc10" distributions on tape (in order to do the absolute
+	wish to place on the tape.  For instance, to put the "base11"
+	and "etc11" distributions on tape (in order to do the absolute
 	minimum installation to a new disk), you would do the
 	following:
 
-		cd .../NetBSD-1.0		# the top of the tree
+		cd .../NetBSD-1.1		# the top of the tree
 		cd i386/binary
-		tar cf <tape_device> base10 etc10
+		tar cf <tape_device> base11 etc11
 
 	(Note that you still need to fill in "<tape_device>" in the
 	example.)
@@ -176,7 +173,7 @@ following:
 	Place the distribution sets you wish to upgrade somewhere in
 	your current file system tree.  At a bare minimum, you must
 	upgrade the "base" binary distribution, and so must put the
-	"base10" set somewhere in your file system.  If you wish,
+	"base11" set somewhere in your file system.  If you wish,
 	you can do the other sets, as well, but you should NOT upgrade
 	the "etc" distribution; the "etc" distribution contains system
 	configuration files that you should review and update by hand.
diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index b62366ce756..5b85c67cf93 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -2,57 +2,57 @@ Host name		Services Provided
 ---- ----		-------- --------
 ftp.iastate.edu		Anonymous FTP, AFS
 
-	Anon-FTP path: pub/netbsd/NetBSD-1.0
-	AFS path: /afs/iastate.edu/public/ftp/pub/netbsd/NetBSD-1.0
+	Anon-FTP path: pub/netbsd
+	AFS path: /afs/iastate.edu/public/ftp/pub/netbsd
 
 ftp.eecs.umich.edu	Anonymous FTP
 
-	Anon-FTP path: BSD/NetBSD/NetBSD-1.0
+	Anon-FTP path: BSD/NetBSD
 
 gatekeeper.dec.com	Anonymous FTP
 
-	Anon-FTP path: pub/BSD/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/BSD/NetBSD
 
 wipux2.wifo.uni-mannheim.de	Anonymous FTP, SUP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 	SUP: get the file pub/misc/sup/supfile.example via
 		anonymous FTP and read it as an example.
 
 ftp.demon.co.uk		Anonymous FTP, possibly SUP
 
-	Anon-FTP path: pub/BSD/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/BSD/NetBSD
 	SUP: contact peter@demon.net for SUP server status/information
 
 ftp.uni-regensburg.de	Anonymous FTP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 
 ftp.unit.no		Anonymous FTP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 
 ftp.stacken.kth.se	Anonymous FTP
 
-	Anon-FTP path: pub/OS/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/OS/NetBSD
 
 flick.lerc.nasa.gov	Anonymous FTP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 
 coombs.anu.edu.au	Anonymous FTP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 
 ftp.funet.fi		Anonymous FTP
 
-	Anon-FTP path: pub/unix/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/unix/NetBSD
 
 ftp.netbsd.org		Anonymous FTP, SUP
 
-	Anon-FTP path: pub/NetBSD/NetBSD-1.0
+	Anon-FTP path: pub/NetBSD
 	SUP: get the file pub/sup/README.sup via anonymous FTP from
 		ftp.netbsd.org, and read it for instructions.
 
-If you wish to become a distribution site for NetBSD, contact Chris
-Demetriou <cgd@NetBSD.ORG>.
+If you wish to become a distribution site for NetBSD, contact
+mirrors@netbsd.org.