sync w/ Net 960425

2 files changed, 30 insertions, 6 deletions

diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 10b04f36b57..b92b6879779 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -18,9 +18,12 @@ Preparing you hard disk with HDToolBox:
 
 		Back up the partitions you are keeping.
 
-	What you need to do is partition your drives; creating
-	at least root, swap and /usr partitions and possibly at least
-	one more for /local if you have the space.
+	What you need to do is partition your drives; creating at least
+	root, swap and /usr partitions and possibly at least one more for
+	/local if you have the space. (The root and swap partitions must
+	be on the same drive for your initial installation. You can use
+	other configurations after building a customized kernel once your
+	system is running.)
 
 	This should be done as the HDToolBox manual describes.  One thing
 	to note is that if you are not using a Commodore controller you
@@ -100,14 +103,14 @@ Transferring the miniroot filesystem:
 	single-user state processes are not using the swap partition.
 
 	On AmigaDOS, the command:
-		xstreamtodev --input=inst-11.fs -rdb-name=<swap partition>
+		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>".
+	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
diff --git a/distrib/notes/pc532/legal b/distrib/notes/pc532/legal
index c61c3a90db2..cdc135958a6 100644
--- a/distrib/notes/pc532/legal
+++ b/distrib/notes/pc532/legal
@@ -7,6 +7,8 @@
 
 	This product includes software developed by Philip A. Nelson.
 
+	This product includes software developed by Matthias Pfaller.
+
 	This product includes software at the Helsinki University of
 	Technology.  
 
@@ -83,3 +85,22 @@ Some files have the following copyright:
  * any improvements or extensions that they make and grant Carnegie Mellon 
  * the rights to redistribute these changes.
  */
+
+The IEEE floating point support in /usr/src/sys/arch/pc532/fpu has
+the following copyright:
+
+/* 
+ * IEEE floating point support for NS32081 and NS32381 fpus.
+ * Copyright (c) 1995 Ian Dall
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * IAN DALL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.
+ * IAN DALL DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ */