Module Name:	basesrc
Committed By:	lukem
Date:		Wed Jun 19 00:56:53 UTC 2002

Modified Files:
	basesrc/distrib/notes/common [netbsd-1-6]: contents main netboot
	    postinstall sysinst xfer

Log Message:
do a manual catch up to -current; it was getting too hard to track the
different changes without lots of manual intervention on conflict
resolution, and all the changes are relevent for 1.6 anyway :)
(parts of this cover ticket #289 from wiz.)


To generate a diff of this commit:
cvs rdiff -r1.52.2.5 -r1.52.2.6 basesrc/distrib/notes/common/contents
cvs rdiff -r1.179.2.2 -r1.179.2.3 basesrc/distrib/notes/common/main
cvs rdiff -r1.4.2.2 -r1.4.2.3 basesrc/distrib/notes/common/netboot
cvs rdiff -r1.33.2.1 -r1.33.2.2 basesrc/distrib/notes/common/postinstall
cvs rdiff -r1.32.2.4 -r1.32.2.5 basesrc/distrib/notes/common/sysinst
cvs rdiff -r1.24.2.1 -r1.24.2.2 basesrc/distrib/notes/common/xfer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.