knf

57 files changed, 269 insertions, 269 deletions

diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 5d11143c193..e6b8bcf14ee 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2002/04/30 03:47:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/06/09 05:53:53 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -68,7 +68,7 @@ do_prep:
 do_mount:
 	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
- 
+
 do_umount:
 	@echo ""
 	@df -i ${MOUNT_POINT}
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index c0b169760ed..2edad0c8c57 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2002/04/30 03:47:03 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2002/06/09 05:53:53 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -92,7 +92,7 @@ do_prep:
 do_mount:
 	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
- 
+
 do_umount:
 	@echo ""
 	@df -i ${MOUNT_POINT}
diff --git a/distrib/alpha/common/disktab.preinstall b/distrib/alpha/common/disktab.preinstall
index 075cb424ea2..d8d6fbdb425 100644
--- a/distrib/alpha/common/disktab.preinstall
+++ b/distrib/alpha/common/disktab.preinstall
@@ -1,7 +1,7 @@
 #
-#	$OpenBSD: disktab.preinstall,v 1.1 2001/01/29 21:25:46 deraadt Exp $
+#	$OpenBSD: disktab.preinstall,v 1.2 2002/06/09 05:53:53 todd Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/alpha/common/disktab.shadow b/distrib/alpha/common/disktab.shadow
index 3c23c5df96d..8d1770b478b 100644
--- a/distrib/alpha/common/disktab.shadow
+++ b/distrib/alpha/common/disktab.shadow
@@ -1,7 +1,7 @@
 #
-#	$OpenBSD: disktab.shadow,v 1.1 2001/01/29 21:25:46 deraadt Exp $
+#	$OpenBSD: disktab.shadow,v 1.2 2002/06/09 05:53:53 todd Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/crunch/crunchgen/crunched_main.c b/distrib/crunch/crunchgen/crunched_main.c
index a4aa819b009..f0c83669c50 100644
--- a/distrib/crunch/crunchgen/crunched_main.c
+++ b/distrib/crunch/crunchgen/crunched_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crunched_main.c,v 1.3 2001/12/28 00:03:23 angelos Exp $	*/
+/*	$OpenBSD: crunched_main.c,v 1.4 2002/06/09 05:53:53 todd Exp $	*/
 
 /*
  * Copyright (c) 1994 University of Maryland
@@ -26,7 +26,7 @@
  *			   University of Maryland at College Park
  */
 /*
- * crunched_main.c - main program for crunched binaries, it branches to a 
+ * crunched_main.c - main program for crunched binaries, it branches to a
  * 	particular subprogram based on the value of argv[0].  Also included
  *	is a little program invoked when the crunched binary is called via
  *	its EXECNAME.  This one prints out the list of compiled-in binaries,
@@ -71,7 +71,7 @@ int crunched_main(int argc, char **argv, char **envp)
     struct stub *ep;
     int columns, len;
 
-    if(argc <= 1) 
+    if(argc <= 1)
 	crunched_usage();
 
     return main(--argc, ++argv, envp);
diff --git a/distrib/crunch/crunchgen/crunchgen.c b/distrib/crunch/crunchgen/crunchgen.c
index 621c976bbf7..817b6c0ca09 100644
--- a/distrib/crunch/crunchgen/crunchgen.c
+++ b/distrib/crunch/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crunchgen.c,v 1.18 2000/11/24 04:18:20 millert Exp $	*/
+/*	$OpenBSD: crunchgen.c,v 1.19 2002/06/09 05:53:53 todd Exp $	*/
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -29,7 +29,7 @@
  * crunchgen.c
  *
  * Generates a Makefile and main C file for a crunched executable,
- * from specs given in a .conf file.  
+ * from specs given in a .conf file.
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
     verbose = 1;
     readcache = 1;
     *outmkname = *outcfname = *execfname = '\0';
-    
+
     if(argc > 0) pname = argv[0];
 
     while((optc = getopt(argc, argv, "m:c:e:fqD:EL:")) != -1) {
@@ -137,7 +137,7 @@ int main(int argc, char **argv)
 	case 'q':	verbose = 0; break;
 
 	case 'm':
-	  if (strlcpy(outmkname, optarg, sizeof(outmkname)) >= 
+	  if (strlcpy(outmkname, optarg, sizeof(outmkname)) >=
 	      sizeof(outmkname))
 	    usage();
 	  break;
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
 
     if(argc != 1) usage();
 
-    /* 
+    /*
      * generate filenames
      */
 
@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 
 void usage(void)
 {
-    fprintf(stderr, 
+    fprintf(stderr,
 	"%s [-fq] [-m <makefile>] [-c <c file>] [-e <exec file>] <conffile>\n",
 	    pname);
     exit(1);
@@ -215,7 +215,7 @@ void usage(void)
 /* helper routines for parse_conf_file */
 
 void parse_one_file(char *filename);
-void parse_line(char *line, int *fc, char **fv, int nf); 
+void parse_line(char *line, int *fc, char **fv, int nf);
 void add_srcdirs(int argc, char **argv);
 void add_progs(int argc, char **argv);
 void add_link(int argc, char **argv);
@@ -275,7 +275,7 @@ void parse_one_file(char *filename)
 	    continue;
 	}
 	if(fieldc < 2) {
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "%s:%d: %s command needs at least 1 argument, skipping.\n",
 		    curfilename, linenum, fieldv[0]);
 	    goterror = 1;
@@ -321,7 +321,7 @@ void add_srcdirs(int argc, char **argv)
         overflow = 0;
         if (argv[i][0] == '/' || topdir[0] == '\0') {
 	     if (strlcpy(tmppath, argv[i], sizeof(tmppath)) >= sizeof(tmppath))
-	       overflow = 1;  
+	       overflow = 1;
 	} else {
 	     if (strlcpy(tmppath, topdir, sizeof(tmppath)) >= sizeof(tmppath)||
 		 strlcat(tmppath, "/", sizeof(tmppath)) >= sizeof(tmppath) ||
@@ -337,7 +337,7 @@ void add_srcdirs(int argc, char **argv)
 	if(is_dir(tmppath))
 	    add_string(&srcdirs, tmppath);
 	else {
-	    fprintf(stderr, "%s:%d: `%s' is not a directory, skipping it.\n", 
+	    fprintf(stderr, "%s:%d: `%s' is not a directory, skipping it.\n",
 		    curfilename, linenum, tmppath);
 	    goterror = 1;
 	}
@@ -365,7 +365,7 @@ void add_prog(char *progname)
 
     p2 = calloc(1, sizeof(prog_t));
     if(p2) p2->name = strdup(progname);
-    if(!p2 || !p2->name) 
+    if(!p2 || !p2->name)
 	out_of_memory();
 
     p2->next = NULL;
@@ -384,7 +384,7 @@ void add_link(int argc, char **argv)
     prog_t *p = find_prog(argv[1]);
 
     if(p == NULL) {
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s:%d: no prog %s previously declared, skipping link.\n",
 		curfilename, linenum, argv[1]);
 	goterror = 1;
@@ -411,7 +411,7 @@ void add_special(int argc, char **argv)
 
     if(p == NULL) {
 	if(reading_cache) return;
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s:%d: no prog %s previously declared, skipping special.\n",
 		curfilename, linenum, argv[1]);
 	goterror = 1;
@@ -457,7 +457,7 @@ void add_special(int argc, char **argv)
 
 
  argcount:
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "%s:%d: too %s arguments, expected \"special %s %s <string>\".\n",
 	    curfilename, linenum, argc < 4? "few" : "many", argv[1], argv[2]);
     goterror = 1;
@@ -509,7 +509,7 @@ void gen_outputs(void)
     gen_output_cfile();
     gen_output_makefile();
     status("");
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "Run \"make -f %s objs exe\" to build crunched binary.\n",
 	    outmkname);
 }
@@ -525,7 +525,7 @@ void fillin_program(prog_t *p)
     snprintf(line, sizeof(line), "filling in parms for %s", p->name);
     status(line);
 
-    if(!p->ident) 
+    if(!p->ident)
 	p->ident = genident(p->name);
     if(!p->srcdir) {
 	srcparent = dir_search(p->name);
@@ -573,11 +573,11 @@ void fillin_program(prog_t *p)
 	fprintf(stderr, "%s: %s: warning: could not find source directory.\n",
 		infilename, p->name);
     if(!p->objs && verbose)
-	fprintf(stderr, "%s: %s: warning: could not find any .o files.\n", 
+	fprintf(stderr, "%s: %s: warning: could not find any .o files.\n",
 		infilename, p->name);
 
     if(!p->objpaths) {
-	fprintf(stderr, 
+	fprintf(stderr,
 		"%s: %s: error: no objpaths specified or calculated.\n",
 		infilename, p->name);
 	p->goterror = goterror = 1;
@@ -645,8 +645,8 @@ void remove_error_progs(void)
 {
     prog_t *p1, *p2;
 
-    p1 = NULL; p2 = progs; 
-    while(p2 != NULL) { 
+    p1 = NULL; p2 = progs;
+    while(p2 != NULL) {
 	if(!p2->goterror)
 	    p1 = p2, p2 = p2->next;
 	else {
@@ -716,7 +716,7 @@ void gen_output_makefile(void)
     top_makefile_rules(outmk);
 
     for(p = progs; p != NULL; p = p->next)
-	prog_makefile_rules(outmk, p); 
+	prog_makefile_rules(outmk, p);
 
     fprintf(outmk, "\n# ========\n");
     fclose(outmk);
@@ -740,7 +740,7 @@ void gen_output_cfile(void)
 	return;
     }
 
-    fprintf(outcf, 
+    fprintf(outcf,
 	  "/* %s - generated from %s by crunchgen %s */\n",
 	    outcfname, infilename, CRUNCH_VERSION);
 
@@ -759,7 +759,7 @@ void gen_output_cfile(void)
 	    fprintf(outcf, "\t{ \"%s\", _crunched_%s_stub },\n",
 		    s->str, p->ident);
     }
-    
+
     fprintf(outcf, "\t{ EXECNAME, crunched_main },\n");
     fprintf(outcf, "\t{ NULL, NULL }\n};\n");
     fclose(outcf);
@@ -819,7 +819,7 @@ void top_makefile_rules(FILE *outmk)
 	fprintf(outmk, " %s_make", p->ident);
     fprintf(outmk, "\n\n");
 
-    fprintf(outmk, "%s: %s.o $(CRUNCHED_OBJS)\n", 
+    fprintf(outmk, "%s: %s.o $(CRUNCHED_OBJS)\n",
 	    execfname, execfname);
     fprintf(outmk, "\t$(CC) -static -o %s %s.o $(CRUNCHED_OBJS) $(LIBS)\n",
 	    execfname, execfname);
@@ -840,11 +840,11 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
 	fprintf(outmk, "%s_OBJS=", p->ident);
 	output_strlst(outmk, p->objs);
 	fprintf(outmk, "%s_make:\n", p->ident);
-	fprintf(outmk, "\t(cd $(%s_SRCDIR); make -f %s $(%s_OBJS))\n\n", 
+	fprintf(outmk, "\t(cd $(%s_SRCDIR); make -f %s $(%s_OBJS))\n\n",
 		p->ident, p->mf_name, p->ident);
     }
     else
-	fprintf(outmk, "%s_make:\n\t@echo \"** cannot make objs for %s\"\n\n", 
+	fprintf(outmk, "%s_make:\n\t@echo \"** cannot make objs for %s\"\n\n",
 		p->ident, p->name);
 
     fprintf(outmk,   "%s_OBJPATHS=", p->ident);
@@ -857,9 +857,9 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
 	    p->ident, p->name);
     fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)\n",
 	    p->name, p->name, p->ident);
-    fprintf(outmk, "\t${LD} -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)\n", 
+    fprintf(outmk, "\t${LD} -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)\n",
 	    p->name, p->name, p->ident);
-    fprintf(outmk, "\tcrunchide -k %s_crunched_%s_stub %s.lo\n", 
+    fprintf(outmk, "\tcrunchide -k %s_crunched_%s_stub %s.lo\n",
 	    elf_names ? "" : "_", p->ident, p->name);
 }
 
diff --git a/distrib/crunch/crunchide/crunchide.c b/distrib/crunch/crunchide/crunchide.c
index 7698560f155..e46713251bb 100644
--- a/distrib/crunch/crunchide/crunchide.c
+++ b/distrib/crunch/crunchide/crunchide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crunchide.c,v 1.14 2001/09/18 21:23:41 jason Exp $	*/
+/*	$OpenBSD: crunchide.c,v 1.15 2002/06/09 05:53:53 todd Exp $	*/
 
 /*
  * Copyright (c) 1994 University of Maryland
@@ -57,7 +57,7 @@
  *      - arrange that all the BSS segments start at the same address, so
  *	  that the final crunched binary BSS size is the max of all the
  *	  component programs' BSS sizes, rather than their sum.
- */ 
+ */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/distrib/crunch/crunchide/elf_hide.c b/distrib/crunch/crunchide/elf_hide.c
index ebb96d2c8a3..29dd9e4eeb6 100644
--- a/distrib/crunch/crunchide/elf_hide.c
+++ b/distrib/crunch/crunchide/elf_hide.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: elf_hide.c,v 1.6 2001/01/23 21:00:20 art Exp $ */
+/*	$OpenBSD: elf_hide.c,v 1.7 2002/06/09 05:53:53 todd Exp $ */
 
 /*
  * Copyright (c) 1997 Dale Rahn. All rights reserved.
  *
- *   
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,7 +28,7 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */  
+ */
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index aab070ca45a..e4573669fda 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.14 2002/05/20 16:53:57 krw Exp $
+#       $OpenBSD: install.md,v 1.15 2002/06/09 05:53:53 todd Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -22,7 +22,7 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
+#
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index d63858e9880..db45e682de6 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2002/04/30 17:59:35 drahn Exp $
+#	$OpenBSD: Makefile,v 1.10 2002/06/09 05:53:54 todd Exp $
 
 REV=	${OSrev}
 
@@ -61,7 +61,7 @@ bsd:
 	    make clean && make depend && make
 	cp ${TOP}/../../sys/arch/macppc/compile/RAMDISK/bsd bsd
 
-rd_setup: 
+rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${IMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile
index e31858932eb..4c104838de2 100644
--- a/distrib/miniroot/dot.profile
+++ b/distrib/miniroot/dot.profile
@@ -1,10 +1,10 @@
-#	$OpenBSD: dot.profile,v 1.1 2002/04/22 02:43:16 deraadt Exp $
+#	$OpenBSD: dot.profile,v 1.2 2002/06/09 05:53:54 todd Exp $
 #	$NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 30d10c5f21e..f5c0a2d4cb6 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.226 2002/06/08 21:52:02 krw Exp $
+#	$OpenBSD: install.sub,v 1.227 2002/06/09 05:53:54 todd Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -182,7 +182,7 @@ askpass() {
 #
 #    $1    = the question to ask the user
 #    $2    = the default answer
-#    
+#
 # Save the user input (or the default) in $resp.
 #
 # Allow the user to escape to shells ('!') or execute commands
@@ -489,7 +489,7 @@ __EOT
 			fi
 			echo $_ifs
 		done
-		: ${_ouranswer:=done} 
+		: ${_ouranswer:=done}
 		ask "\nConfigure which interface? (or 'done')" "$_ouranswer"
 		case $resp in
 		"done")	break	
@@ -844,7 +844,7 @@ get_selection() {
 	esac
 }
 
-# Do globbing on the selection and parse +/-, sets the global 
+# Do globbing on the selection and parse +/-, sets the global
 # _get_files and _setsdone appropriately.
 glob_selection() {
 	local _selection=$1 _src=$2 _sets=$3
@@ -919,7 +919,7 @@ __EOT
 
 }
 
-# Set global _sets to either 
+# Set global _sets to either
 #     1) a list of sets found in both $1 and $THESETS, where
 #        $2 is the location that generated the list of files in $1.
 # or
@@ -1249,7 +1249,7 @@ __EOT
 
 	display_extract_msg
 
-	get_get_files_list "`eval echo \\$_${_url_type}_server_dir`" 
+	get_get_files_list "`eval echo \\$_${_url_type}_server_dir`"
 
 	# User may have selected no files
 	[ "$_get_files" ] || return
@@ -1284,7 +1284,7 @@ install_from_mounted_fs() {
 
 	display_extract_msg
 
-	get_get_files_list "$1" 
+	get_get_files_list "$1"
 
 	# User may have selected no files
 	[ "$_get_files" ] || return
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index cafa0dbbebf..0893590554d 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2002/04/30 09:18:20 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2002/06/09 05:53:54 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -42,7 +42,7 @@ bsd:
 
 rd_test: rd_setup rd_teardown
 
-rd_setup: 
+rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${IMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
diff --git a/distrib/mvme68k/ramdisk/disktab.preinstall b/distrib/mvme68k/ramdisk/disktab.preinstall
index 7ec812bd3fd..cf62493ac3e 100644
--- a/distrib/mvme68k/ramdisk/disktab.preinstall
+++ b/distrib/mvme68k/ramdisk/disktab.preinstall
@@ -1,8 +1,8 @@
 #
-#	$OpenBSD: disktab.preinstall,v 1.2 2000/03/01 22:10:04 todd Exp $
+#	$OpenBSD: disktab.preinstall,v 1.3 2002/06/09 05:53:54 todd Exp $
 #	$NetBSD: disktab.preinstall,v 1.1 1995/07/18 04:13:07 briggs Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/mvme68k/ramdisk/disktab.shadow b/distrib/mvme68k/ramdisk/disktab.shadow
index 1293c9cfd90..14325095e21 100644
--- a/distrib/mvme68k/ramdisk/disktab.shadow
+++ b/distrib/mvme68k/ramdisk/disktab.shadow
@@ -1,8 +1,8 @@
 #
-#	$OpenBSD: disktab.shadow,v 1.2 2000/03/01 22:10:05 todd Exp $
+#	$OpenBSD: disktab.shadow,v 1.3 2002/06/09 05:53:54 todd Exp $
 #	$NetBSD: disktab.shadow,v 1.1.1.1 1996/05/19 19:43:39 leo Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc
index 6e82441de90..0b07609f20e 100644
--- a/distrib/mvme88k/ramdisk/Makefile.inc
+++ b/distrib/mvme88k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.5 2002/04/30 09:18:20 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2002/06/09 05:53:54 todd Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
@@ -22,7 +22,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
 do_files:
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -U 
+	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -U
 	@echo mtree done...
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
diff --git a/distrib/mvme88k/ramdisk/disktab.preinstall b/distrib/mvme88k/ramdisk/disktab.preinstall
index 16831aa051c..73cc9cbb010 100644
--- a/distrib/mvme88k/ramdisk/disktab.preinstall
+++ b/distrib/mvme88k/ramdisk/disktab.preinstall
@@ -1,7 +1,7 @@
 #
-#	$OpenBSD: disktab.preinstall,v 1.1 1998/12/17 02:16:31 smurph Exp $
+#	$OpenBSD: disktab.preinstall,v 1.2 2002/06/09 05:53:54 todd Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/mvme88k/ramdisk/disktab.shadow b/distrib/mvme88k/ramdisk/disktab.shadow
index 20cfaa86e0b..3e954e5f84c 100644
--- a/distrib/mvme88k/ramdisk/disktab.shadow
+++ b/distrib/mvme88k/ramdisk/disktab.shadow
@@ -1,7 +1,7 @@
 #
-#	$OpenBSD: disktab.shadow,v 1.1 1998/12/17 02:16:31 smurph Exp $
+#	$OpenBSD: disktab.shadow,v 1.2 2002/06/09 05:53:54 todd Exp $
 #
-# Disk geometry and partition layout tables. 
+# Disk geometry and partition layout tables.
 # Key:
 #	dt	controller type
 #	ty	type of disk (fixed, removeable, simulated)
diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile
index b2e37dd7130..22b70844dd0 100644
--- a/distrib/mvmeppc/ramdisk/Makefile
+++ b/distrib/mvmeppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2002/04/30 07:35:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2002/06/09 05:53:54 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -56,7 +56,7 @@ bsd:
 	    make clean && make
 	cp ${TOP}/../../sys/arch/mvmeppc/compile/RAMDISK/bsd bsd
 
-rd_setup: 
+rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${IMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 88b53914194..380b03059a8 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -137,7 +137,7 @@ started by entering 'man [section] topic'.  The brackets [] around the
 section should not be entered, but rather indicate that the section is
 optional.  If you don't ask for a particular section, the topic with the
 least-numbered section name will be displayed.  For instance, after
-logging in, enter 
+logging in, enter
 
 	man passwd
 
@@ -152,7 +152,7 @@ If you are unsure of what man page you are looking for, enter
 
 	apropos subject-word
 
-where "subject-word" is your topic of interest; a list of possibly 
+where "subject-word" is your topic of interest; a list of possibly
 related man pages will be displayed.
 
 
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 40af20ac36e..5646c68189c 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.24 2002/05/02 23:13:40 miod Exp $
+dnl	$OpenBSD: hardware,v 1.25 2002/06/09 05:53:54 todd Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run
 OpenBSD, or if you are able to run OpenBSD on hardware not listed
@@ -116,7 +116,7 @@ Supported hardware:
 		Built-in framebuffer.
 		Other TURBOchannel cards.
 
-    DEC 3000 models 400,500,500X,600,700,800,900 
+    DEC 3000 models 400,500,500X,600,700,800,900
 	  Supported devices:
 		Built-in serial ports.
 		Built-in LANCE ethernet.
@@ -140,9 +140,9 @@ Supported hardware:
 	Samsung 164BX/UX (no SRM)
 	Multiprocessor alpha systems
 	VME Alpha systems
-               
+
 Supported Peripherals:
-               
+
 	PCI IDE Controllers (pciide)
 		Acer Labs M5229
 		CMD Tech PCI0640, PCI0643, PCI0646, PCI0648, and PCI0649
@@ -225,7 +225,7 @@ Supported Peripherals:
 			SMC EZ Card 10/100 PCI 1211-TX
 		VIA Rhine/RhineII Ethernet adapters (vr), including: [*]
 			Addtron AEF-360TX
-			Hawking PN102TX  
+			Hawking PN102TX
 			D-Link DFE530TX
 	Gigabit Ethernet Adapters
 		Intel i82542, i82543, and i82544 based adapters (gx),
@@ -261,9 +261,9 @@ Supported Peripherals:
 	Sound Devices [*]
 		Ensoniq AudioPCI (eap)
 		SoundBlaster PCI128 (eap)
-               
+
 Untested Peripherals:
-               
+
 The following peripherals are compiled into the system, but are not known to
 work. It's our best guess that they do, but any feedback is appreciated.
 
@@ -289,7 +289,7 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			Adaptec Single32 ANA-69011
 			Adaptec Single64 ANA-62011 and ANA-62020
 			Adaptec Duo64 ANA-62022
-			Adaptec Quartet64 ANA-62044 
+			Adaptec Quartet64 ANA-62044
 		ADMtek AN986-based USB adapters (aue), including: [*]
 			Abocom UFE1000
 			Abocom DSB650TX
@@ -348,11 +348,11 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			Matrox Networks FastNIC 10/100
 			Netgear FA310TX
 		Macronix 98713/98715/98725-based adapters (dc), including: [*]
-			Accton EN1217   
+			Accton EN1217
 			Addtron AEF-320TX/AEF-330TX
 			CNet PRO120A/B
 			Complex RL-100TX
-			NDC Communications SOHOware SFA110A 
+			NDC Communications SOHOware SFA110A
 			SVEC PN102-TX Fast Ethernet card
 		National Semiconductor DP83815-based PCI adapters (sis),
 		  including: [*]
@@ -385,7 +385,7 @@ work. It's our best guess that they do, but any feedback is appreciated.
 			Digital EtherWORKS 1000SX
 			Farallon PN9000SX
 			Netgear GA620 and GA620T
-			SGI Tigon   
+			SGI Tigon
 		SysKonnect SK-984x (9841/9842/9843/9844) based adapters (sk)
 	ATM Adapters [*]
 		Efficient Networks EN-155 and Adaptec ANA-590x ATM interfaces
@@ -396,7 +396,7 @@ work. It's our best guess that they do, but any feedback is appreciated.
 		Lan Media Corporation SSI (T1)/HSSI/DS1/DS3 WAN interfaces
 		  (lmc)
 	Universal Serial Bus (USB) Devices [*]
-		USB Audio (uaudio) [-] 
+		USB Audio (uaudio) [-]
 		USB Diamond MultiMedia Rio MP3 players (urio) [-]
 		USB Ethernet adapters (aue, cue, kue), see above
 		USB Generic Human Interface Devices (catch-all) (uhid)
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index a056906d012..6209929bcd0 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.14 2002/05/02 23:13:40 miod Exp $
+dnl	$OpenBSD: prep,v 1.15 2002/06/09 05:53:54 todd Exp $
 OpenBSD/MACHINE requires the SRM console.  Some alphas come with
 the AlphaBIOS (also known as the ARC firmware on older machines) instead;
 this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS
@@ -60,7 +60,7 @@ Using the SRM console:
 			set to "a".
     To see a list of all variables on your machine use the "show"
     command with no arguments.
-    
+
     You can bypass the boot_file and boot_osflags values from the command
     prompt, with the -fi (to override boot_file) and -fl (to override
     boot_osflags) options. For example,
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 055dc7f75e7..eac98f7a2d9 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.19 2002/03/30 16:46:29 miod Exp $
+dnl	$OpenBSD: prep,v 1.20 2002/06/09 05:53:54 todd Exp $
 You will need an AmigaDOS hard drive prep tool to prepare you hard
 drives for use with OpenBSD/amiga.  HDToolBox is provided with the
 system software and on floppy installation disks since Release 2.0
@@ -6,17 +6,17 @@ of AmigaDOS so we will provide instructions for its use.
 
 Preparing your hard disk with HDToolBox:
 
-	If you intend to use a hard disk larger than 4GB, or partitions 
-	larger than 2GB be advised to either get HDToolBox for AmigaDOS 3.5 
-	or a third party hard disk preparation tool (such as HdInstTools) 
-	from Aminet, together with the appropriate patches from 
+	If you intend to use a hard disk larger than 4GB, or partitions
+	larger than 2GB be advised to either get HDToolBox for AmigaDOS 3.5
+	or a third party hard disk preparation tool (such as HdInstTools)
+	from Aminet, together with the appropriate patches from
 	www.amiga.com to let AmigaDOS see the full size of the drive.
 
 	A full explanation of HDToolBox can be found with your
 	AmigaDOS manuals and is beyond the scope of this document.
 
-	Note that you will be modifying your HD. If you mess something 
-	up here you could lose *EVERYTHING* on all the drives that 
+	Note that you will be modifying your HD. If you mess something
+	up here you could lose *EVERYTHING* on all the drives that
 	you configure.  You are therefore advised to:
 
 		Write down your current configuration.  Do this
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 385fe0f3ed6..06b74574a2d 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,8 +1,8 @@
-dnl	$OpenBSD: install,v 1.21 2002/04/09 01:22:22 miod Exp $
+dnl	$OpenBSD: install,v 1.22 2002/06/09 05:53:54 todd Exp $
 OpenBSDInstallPrelude
 dnl No extra line, this has to stick to the geometry notes paragraph.
 The file `HP-IB.geometry' has geometry information for several HP-IB
-disks, but may be incomplete.  Geometry may be calculated from an HP-UX 
+disks, but may be incomplete.  Geometry may be calculated from an HP-UX
 `/etc/disktab' entry, but note that HP-UX geometry is based on
 1024 byte sectors, while OpenBSD's is based on 512 byte sectors.
 
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 975d48832e4..cbcc0642bb9 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -23,7 +23,7 @@ As well you may be interested in
 
 .../OSREV/tools/
 		miscellaneous MACHINE installation utilities like
-		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe; 
+		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe;
 		see installation section, below.
 
 
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index fc4adccde05..a28af8facbd 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.84 2002/06/08 00:11:47 aaron Exp $
+dnl	$OpenBSD: hardware,v 1.85 2002/06/09 05:53:54 todd Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PC's 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
@@ -16,7 +16,7 @@ X or compile the system, more RAM is recommended.  (16M of RAM will actually
 allow you to run X and/or compile but it won't be speedy. Note that until
 you have around 32M of RAM, getting more RAM is more important than getting
 a faster CPU.)
- 
+
 Supported hardware {:-include-:}:
 	Processors
 		All CPU chips compatible with the Intel 80386 (MACHINE)
@@ -155,7 +155,7 @@ Supported hardware {:-include-:}:
 		    I2O, including Intel and Mylex (untested)
 	CD-ROM and DVD-ROM Drives
 		Mitsumi CD-ROM drives [*]
-		    [Note: The Mitsumi driver device probe is known 
+		    [Note: The Mitsumi driver device probe is known
 		    to cause trouble with several devices!]
 		Most SCSI CD-ROM, CD-R, CD-RW, and DVD drives
 		Most ATAPI CD-ROM, CD-R, CD-RW, and DVD drives
@@ -174,7 +174,7 @@ Supported hardware {:-include-:}:
 		ST16660-base ports
 		XR16850-based ports (only in the pccom driver)
 		AST-style 4-port serial boards [G]
-		BOCA 8-port serial cards [*] 
+		BOCA 8-port serial cards [*]
 		Cyclades Cyclom-{4, 8, 16}Y serial boards [G]
 		Cyclades-Z series multiport serial boards [G]
 		IBM PC-RT 4-port serial boards [*]
@@ -436,7 +436,7 @@ Supported hardware {:-include-:}:
 		    SGI Tigon
 		Intel i82542, i82543, and i82544 based adapters, including:
 		  [A] [B] [C]
-		  Often known as Intel Pro/1000 Gigabit Server Adapter 
+		  Often known as Intel Pro/1000 Gigabit Server Adapter
 		    Intel i82542 1000BASE-X Ethernet
 		    Intel i82543 1000BASE-X Ethernet
 		    Intel i82543-SC 1000BASE-X Ethernet
@@ -458,16 +458,16 @@ Supported hardware {:-include-:}:
 		    D-Link DGE-500SX
 		Broadcom BCM570x (Tigon3) based PCI adapters, including: [A]
 		  [B] [C]
-		    3Com 3c996-T (10/100/1000baseTX) 
+		    3Com 3c996-T (10/100/1000baseTX)
 		    3Com 3c996-SX (1000baseSX)
 		    3Com 3c996B-T (10/100/1000baseTX)
 		    Dell PowerEdge 2550 integrated BCM5700 NIC
 		      (10/100/1000baseTX)
-		    SysKonnect SK-9D21 (10/100/1000baseTX) 
-		    SysKonnect SK-9D41 (1000baseSX) 
+		    SysKonnect SK-9D21 (10/100/1000baseTX)
+		    SysKonnect SK-9D41 (1000baseSX)
 		Sundance/Tamarack TC9021 based PCI adapters, including: [G]
-		    D-Link DGE-550T (10/100/1000baseTX) 
-		    Antares Microsystems Gigabit Ethernet board 
+		    D-Link DGE-550T (10/100/1000baseTX)
+		    Antares Microsystems Gigabit Ethernet board
 		SysKonnect SK-9841/9842/9843/9844 Gigabit Ethernet
 		  adapters [A] [B] [C]
 	ATM Adapters
@@ -584,7 +584,7 @@ Supported hardware {:-include-:}:
 		Windows Sound System
 	Miscellaneous Devices
 		APM power management,
-		Brooktree 8[47][89] based frame grabber and TV tuner cards, 
+		Brooktree 8[47][89] based frame grabber and TV tuner cards,
 		including: [G]
 		    Hauppage Wincast TV
 		    STB TV PCI Television Tuner
@@ -672,7 +672,7 @@ Ultrastor 14f, 24f (if it works), or 34f SCSI host adapters
 AHA-152x, AIC-6260- or AIC-6360-based SCSI host adapters
 		aic0	0x340	11	any
 
-Seagate ST0[12], Future Domain TMC-8xx based SCSI controllers 
+Seagate ST0[12], Future Domain TMC-8xx based SCSI controllers
 		sea0		5		iomem 0xc8000
 
 WD7000 and TMC-7000 SCSI host adapters
@@ -779,7 +779,7 @@ Special care for SMC Elite Ultra:
 
 
 Special care for PCI BIOS:
- 
+
 	As all BIOS implementations and subsystems this one has bugs too.
 	Sometimes specifications are unclear about interfaces and/or data
 	validation.
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index cb8bc1a5136..1f977e7495b 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.34 2002/04/14 02:35:27 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.35 2002/06/09 05:53:54 todd Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -53,7 +53,7 @@ define({:-showsize-:},{:-ifelse(X$1,X,,X$2,X,,X,X,{:-
 		 [ $1 MB gzipped, $2 MB uncompressed ]-:})-:})dnl
 dnl
 dnl
-dnl 
+dnl
 dnl DistributionDescription( number of sets )
 dnl Header paragraph before the individual sets descriptions.
 dnl
@@ -244,7 +244,7 @@ define({:-OpenBSDInstallPart2-:},
 
 The following is a walk-through of the steps you will take while
 getting OpenBSD installed on your hard disk.  If any question has a
-default answer, it will be displayed in brackets ("[]") after the  
+default answer, it will be displayed in brackets ("[]") after the
 question.  If you wish to stop the installation, you may hit Control-C
 at any time, but if you do, you'll have to begin the installation
 process again from scratch.  Using Control-Z to suspend the process
@@ -503,7 +503,7 @@ dnl together in the actual document.
 dnl
 dnl Arg 1 is optional.
 dnl Choices for args 2 & 3:
-dnl - OpenBSDDISKInstall(,{:-only -:})  
+dnl - OpenBSDDISKInstall(,{:-only -:})
 dnl    (only have 1 fs possible, ffs)
 dnl - OpenBSDDISKInstall(,,{:-or <insert some other filesystem name>-:})
 dnl    (have another fs possible for reading during disk install)
@@ -592,8 +592,8 @@ dnl
 define({:-OpenBSDCongratulations-:},
 {:-Congratulations, you have successfully installed OpenBSD OSREV.  When you
 reboot into OpenBSD, you should log in as "root" at the login prompt.
-You should create yourself an account and protect it and the "root" account 
-with good passwords.  You should have got a mail from the install program we 
+You should create yourself an account and protect it and the "root" account
+with good passwords.  You should have got a mail from the install program we
 recommend you to read, it contains answers to basic questions you might
 have about OpenBSD (like setting up your system, installing packages, getting
 more information about OpenBSD, sending in your dmesg output and more).
@@ -655,7 +655,7 @@ depend on which method of installation you choose.  Some methods
 require a bit of setup first that is explained below.
 
 The installation allows installing OpenBSD directly from FTP mirror
-sites over the internet, however you must consider the speed and 
+sites over the internet, however you must consider the speed and
 reliability of your internet connection for this option.  It may save
 much time and frustration to use ftp get/reget to transfer the
 distribution sets to a local server or disk and perform the installation
@@ -673,12 +673,12 @@ define({:-OpenBSDXferFloppyFromDOS-:},
 {:-Creating a bootable floppy disk using DOS/Windows:
 
 	First you need to get access to the OpenBSD bootable floppy
-	images. If you can access the distribution from the CD-ROM under 
-	DOS, you will find the bootable disks in the OSREV/MACHINE 
-	directory. Otherwise, you will have to download them from one of 
-	the OpenBSD ftp or http mirror sites, using an ftp client or a web 
-	browser. In either case, take care to do "binary" transfers, since 
-	these are images files and any DOS cr/lf translations or control/z 
+	images. If you can access the distribution from the CD-ROM under
+	DOS, you will find the bootable disks in the OSREV/MACHINE
+	directory. Otherwise, you will have to download them from one of
+	the OpenBSD ftp or http mirror sites, using an ftp client or a web
+	browser. In either case, take care to do "binary" transfers, since
+	these are images files and any DOS cr/lf translations or control/z
 	EOF interpretations will result in corrupted transfers.
 	
 	You will also need to go to the "tools" directory and grab a
@@ -692,11 +692,11 @@ define({:-OpenBSDXferFloppyFromDOS-:},
 	the floppy drive, such as "a:".  Be sure to use good quality HD
 	(1.44MB) floppies, formatted on the system you're using.  The
 	image copy and boot process is not especially tolerant of read
-	errors. 
+	errors.
 
 	Note that if you are using NT to write the images to disk, you
 	will need to use ntrw.exe instead.  It is also available in the
-	"tools" directory.  Grab it and run in with the correct 
+	"tools" directory.  Grab it and run in with the correct
 	arguments like this "ntrw <image> <drive>:"
 
 	Note that, when installing, the boot floppy can be write-protected
@@ -706,8 +706,8 @@ define({:-OpenBSDXferFloppyFromUNIX-:},
 {:-Creating a bootable floppy disk using SunOS, Solaris or other Un*x-like system:
 
 	First, you will need obtain a local copy of the bootable filesystem
-	image as described above.  If possible use the cksum(1) or md5(1) 
-	commands to verify the checksums of the images vs. the values in 
+	image as described above.  If possible use the cksum(1) or md5(1)
+	commands to verify the checksums of the images vs. the values in
 	the CKSUM or MD5 files on the mirror site.
 
 	Next, use the dd(1) utility to copy the file to the floppy drive.
@@ -751,19 +751,19 @@ define({:-OpenBSDXferBareTape-:},
 	format or in "gzipped tar format".  First you will need to
 	transfer the distribution sets to your local system, using ftp or
 	by mounting the CD-ROM containing the release.  Then you need to
-	make a tape containing the files. 
-        
+	make a tape containing the files.
+
 	If you're making the tape on a UN*X-like system, the easiest way
 	to do so is make a shell script along the following lines, call it
-	"/tmp/maketape". 
-        
+	"/tmp/maketape".
+
 	#! /bin/sh
 	TAPE=${TAPE:-/dev/nrst0}
 	mt -f ${TAPE} rewind
 	for file in base etc comp game man misc $1
 	do
 		dd if=${file}OSrev.tgz of=${TAPE} obs=8k conv=sync
-	done    
+	done
 	tar cf ${TAPE} bsd
 	mt -f ${TAPE} offline
 	# end of script
@@ -795,12 +795,12 @@ define({:-OpenBSDXferBootTape-:},
 	"gzipped tar format".  First you will need to transfer the
 	distribution sets to your local system, using ftp or by
 	mounting the CD-ROM containing the release.  Then you need to
-	make a tape containing the files. 
-        
+	make a tape containing the files.
+
 	If you're making the tape on a UN*X-like system, the easiest way
 	to do so is make a shell script along the following lines, call it
-	"/tmp/maketape". 
-        
+	"/tmp/maketape".
+
 	#! /bin/sh
 	TAPE=${TAPE:-/dev/nrst0}
 	mt -f ${TAPE} rewind
@@ -815,7 +815,7 @@ ifelse(X$4,X,,{:-		dd of=${TAPE} if=$4
 	for file in base etc comp game man misc $1
 	do
 		dd if=${file}OSrev.tgz of=${TAPE} obs=8k conv=sync
-	done    
+	done
 	tar cf ${TAPE} bsd
 	mt -f ${TAPE} offline
 	# end of script
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index b0b6b504c1f..e911c5fa10e 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: contents,v 1.34 2002/04/14 02:33:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.35 2002/06/09 05:53:54 todd Exp $
 TopPart
 
 OpenBSDdistsets
 
-		bsd-generic.tgz The OpenBSD/MACHINE OSREV kernel binary.  
+		bsd-generic.tgz The OpenBSD/MACHINE OSREV kernel binary.
 				You MUST install either this file or
 				bsd-genericsbic.tgz blow.  It is the kernel
 				that you need to boot the system.
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 0a2ea43c5ad..d678dc3d998 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2002/04/07 21:25:00 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2002/06/09 05:53:54 todd Exp $
 OpenBSDInstallPrelude
 
 The installation can be broken down into four basic steps:
@@ -82,8 +82,8 @@ If you are installing onto a single root partition, proceed to the
 Installation of base files:
 
 	Select the "Install" menu item from the "File" menu and install
-	base{:--:}OSrev.tgz, bsd-generic.tgz, comp{:--:}OSrev.tgz, and any other 
-	packages you wish to install at this time (see the contents section 
+	base{:--:}OSrev.tgz, bsd-generic.tgz, comp{:--:}OSrev.tgz, and any other
+	packages you wish to install at this time (see the contents section
 	for information about what's in each package).  The installer will
 	print out the filename of each file as it is installed and will
 	take quite some time to install everything.
diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep
index 09bd04f809d..cc1aef14bbe 100644
--- a/distrib/notes/mac68k/prep
+++ b/distrib/notes/mac68k/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.10 2002/04/07 21:25:00 miod Exp $
+dnl	$OpenBSD: prep,v 1.11 2002/06/09 05:53:54 todd Exp $
 Find your favorite disk partitioning utility.  Some
 of the ones that have been tried and seem to work are:
 	APS Powertools 2.7.3
@@ -13,7 +13,7 @@ You can get "HD SC Setup" from
 	    Apple_Software_Updates/English-North_American/Macintosh/Utilities/
 	    Apple_HD_SC_Setup_7.3.5.sea.bin
 (this address has been split into several lines for readability).
-This utility ignores non-Apple hard disks unless you patch it with the 
+This utility ignores non-Apple hard disks unless you patch it with the
 application found at <http://www.euronet.nl/users/ernstoud/hdpatch.html>.
 
 ** First, be sure you have a reliable backup of any data
diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis
index fb41fb0ff47..9343213dc22 100644
--- a/distrib/notes/mac68k/whatis
+++ b/distrib/notes/mac68k/whatis
@@ -1,5 +1,5 @@
 OpenBSD/MACHINE OSREV is a port to the old Macintosh (680x0-based)
-computers.  As always, there is much to be done on this 
+computers.  As always, there is much to be done on this
 architecture, and help is very much appreciated.  However,
 a wide variety of hardware and software is completely
 functional making the system an excellent answer to the question
diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware
index b71f7a1af91..c62ef984434 100644
--- a/distrib/notes/macppc/hardware
+++ b/distrib/notes/macppc/hardware
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: hardware,v 1.8 2002/04/07 23:40:57 miod Exp $
+dnl	$OpenBSD: hardware,v 1.9 2002/06/09 05:53:54 todd Exp $
 OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, G4 Cube as well
 as PowerBook and iBook machines.
 
 Machines with older firmware: 6xxx, 7xxx 8xxx, and 9xxx machines are
-not supported.  PowerMac G3 Beige status is unknown. 
+not supported.  PowerMac G3 Beige status is unknown.
 
 OpenBSD/MACHINE has been tested on iMac Revs A-C as well as on iMac DV(+)
 machines, Power Macintosh G4 systems (single and dual processor), as well as
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index b1c545af549..84d57c70937 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.11 2002/04/09 01:22:22 miod Exp $
+dnl	$OpenBSD: install,v 1.12 2002/06/09 05:53:54 todd Exp $
 OpenBSDInstallShortPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -55,28 +55,28 @@ OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:})
 	Before editing, the partition table may look like the following:
 
 	 #:                type name             length   base    ( size )
-	 1: Apple_partition_map Apple                63 @ 1      
-	 2:      Apple_Driver43*Macintosh            54 @ 64     
-	 3:      Apple_Driver43*Macintosh            74 @ 118    
-	 4:    Apple_Driver_ATA*Macintosh            54 @ 192    
-	 5:    Apple_Driver_ATA*Macintosh            74 @ 246    
-	 6:      Apple_FWDriver Macintosh           200 @ 320    
-	 7:  Apple_Driver_IOKit Macintosh           512 @ 520    
-	 8:       Apple_Patches Patch Partition     512 @ 1032   
+	 1: Apple_partition_map Apple                63 @ 1
+	 2:      Apple_Driver43*Macintosh            54 @ 64
+	 3:      Apple_Driver43*Macintosh            74 @ 118
+	 4:    Apple_Driver_ATA*Macintosh            54 @ 192
+	 5:    Apple_Driver_ATA*Macintosh            74 @ 246
+	 6:      Apple_FWDriver Macintosh           200 @ 320
+	 7:  Apple_Driver_IOKit Macintosh           512 @ 520
+	 8:       Apple_Patches Patch Partition     512 @ 1032
 	 9:           Apple_HFS untitled        2142310 @ 1544    (  1.0G)
 	10:           Apple_HFS untitled 2      4120589 @ 2143854 (  2.0G)
 	11:              Unused untitled 3      6330517 @ 6264443 (  3.0G)
 
 	After editing the table, it should look like:
 	 #:                type name             length   base    ( size )
-	 1: Apple_partition_map Apple                63 @ 1      
-	 2:      Apple_Driver43*Macintosh            54 @ 64     
-	 3:      Apple_Driver43*Macintosh            74 @ 118    
-	 4:    Apple_Driver_ATA*Macintosh            54 @ 192    
-	 5:    Apple_Driver_ATA*Macintosh            74 @ 246    
-	 6:      Apple_FWDriver Macintosh           200 @ 320    
-	 7:  Apple_Driver_IOKit Macintosh           512 @ 520    
-	 8:       Apple_Patches Patch Partition     512 @ 1032   
+	 1: Apple_partition_map Apple                63 @ 1
+	 2:      Apple_Driver43*Macintosh            54 @ 64
+	 3:      Apple_Driver43*Macintosh            74 @ 118
+	 4:    Apple_Driver_ATA*Macintosh            54 @ 192
+	 5:    Apple_Driver_ATA*Macintosh            74 @ 246
+	 6:      Apple_FWDriver Macintosh           200 @ 320
+	 7:  Apple_Driver_IOKit Macintosh           512 @ 520
+	 8:       Apple_Patches Patch Partition     512 @ 1032
 	 9:           Apple_HFS untitled        2142310 @ 1544    (  1.0G)
 	10:           Apple_HFS untitled 2      4120589 @ 2143854 (  2.0G)
 	11:             OpenBSD OpenBSD         6330517 @ 6264443 (  3.0G)
diff --git a/distrib/notes/macppc/prep b/distrib/notes/macppc/prep
index 696b78d745d..dce66401da0 100644
--- a/distrib/notes/macppc/prep
+++ b/distrib/notes/macppc/prep
@@ -92,7 +92,7 @@ setenv boot-device hd:,ofwboot
 [to save the results into nvram]
 reset-all
 
-These settings assume that the master of the first IDE bus has OpenBSD 
+These settings assume that the master of the first IDE bus has OpenBSD
 installed on it, either in MBR format or in shared mode with ofwboot
 copied into the first HFS(+) partition. It is not necessary to specify
 '/bsd' on the boot line or in the boot-device variable, since it is the
@@ -100,7 +100,7 @@ default.
 
 To boot in MacOS with this setup (works on most supported machines)
 press and hold down the Alt/Option key during reboot, and select which
-(MacOS/MacOS X) partition to boot in the graphical boot selector 
+(MacOS/MacOS X) partition to boot in the graphical boot selector
 presentes. Note that OpenBSD does not currently show up in this boot
 selector except for the installation CD. This works on most machines
 this has been tested with, but does not work on a Rev C (333MHz) iMac,
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 92da334a96e..83ad3b2e18b 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.9 2002/04/14 02:36:04 miod Exp $
+dnl	$OpenBSD: hardware,v 1.10 2002/06/09 05:53:54 todd Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
 	- MVME162 - Motorola with 68040
@@ -15,7 +15,7 @@ more important than getting a faster CPU board.
 Supported devices {:-include-:}:
 
 MVME147:
-	serial ports: 
+	serial ports:
 		on-board ttya-ttyd
 	ethernet:
 		on-board AMD 7990 Lance ethernet ("le0")
@@ -50,9 +50,9 @@ MVME162, MVME172:
 MVME167, MVME177:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
-	ethernet: 
+	ethernet:
 		on-board Intel 82596CA ethernet ("ie0")
-	SCSI: 
+	SCSI:
 		on-board NCR53c710 controller
 	parallel:
 		not supported
diff --git a/distrib/notes/mvme68k/whatis b/distrib/notes/mvme68k/whatis
index c6c4bf497db..b55821cae7e 100644
--- a/distrib/notes/mvme68k/whatis
+++ b/distrib/notes/mvme68k/whatis
@@ -1,6 +1,6 @@
 OpenBSD/MACHINE OSREV was written under contract for Willowglen Singapore
-for an embedded application.  Theo de Raadt, Dale Rahn, Chuck Cranor, 
-and Steve Murphree were involved in working on this port which runs on 
+for an embedded application.  Theo de Raadt, Dale Rahn, Chuck Cranor,
+and Steve Murphree were involved in working on this port which runs on
 the MVME147, MVME162, MVME167, MVME172, MVME177 and perhaps other models
 also.
 
diff --git a/distrib/notes/mvme88k/hardware b/distrib/notes/mvme88k/hardware
index 18ab214293b..968c18c55e9 100644
--- a/distrib/notes/mvme88k/hardware
+++ b/distrib/notes/mvme88k/hardware
@@ -2,7 +2,7 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME187 - Motorola with 88100
 
 The minimal configuration requires 4M of RAM and ~80M of disk space.
-To install the entire system requires much more disk space, and to 
+To install the entire system requires much more disk space, and to
 compile the system, more RAM is recommended.  (OpenBSD with 4M of
 RAM feels like Solaris with 4M of RAM.) Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
@@ -13,9 +13,9 @@ Supported devices {:-include-:}:
 MVME187
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
-	ethernet: 
+	ethernet:
 		on-board Intel 82596CA ethernet ("ie0")
-	SCSI: 
+	SCSI:
 		on-board SCSI controller NCR53c710
 
 	Parallel:
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 86ced32a0a6..1dec1d9b1b0 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -3,17 +3,17 @@ this document in hand it shouldn't be too much trouble.
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
-be booted from tape. Alternatively, if your mvme88k is hooked up in a 
-network you can find a server and arrange for a diskless setup which is a 
-convenient way to install on a machine whose disk does not currently hold 
-a usable operating system (see the section `Installing using a diskless 
+be booted from tape. Alternatively, if your mvme88k is hooked up in a
+network you can find a server and arrange for a diskless setup which is a
+convenient way to install on a machine whose disk does not currently hold
+a usable operating system (see the section `Installing using a diskless
 setup' below).
 
 
 Installing using the OpenBSD ramdisk kernel.
 
-The ramdisk kernel is a kernel that containes an OpenBSD filesystem holding 
-all utilities necessary to install OpenBSD on a local disk. It is distributed 
+The ramdisk kernel is a kernel that containes an OpenBSD filesystem holding
+all utilities necessary to install OpenBSD on a local disk. It is distributed
 as a binary file with the name bsd.rd.
 
 After the initial probe messages you'll asked to start the install
@@ -30,8 +30,8 @@ If the server runs another operating system, you'll have to consult
 documentation that came with it (on SunOS systems, add_client(8) is a
 good start).
 
-Second, you must configure the netboot parameters in the mvme88k Bug 
-using the NIOT command.  The Load Address should be 0xAF0000.  The 
+Second, you must configure the netboot parameters in the mvme88k Bug
+using the NIOT command.  The Load Address should be 0xAF0000.  The
 Execution Address should be 0xAF0008.
 
 Your mvme88k expects to be able to download a second stage bootstrap
@@ -39,12 +39,12 @@ program via TFTP after having acquired its IP address through RevARP when
 instructed to boot "over the net". It will look for a filename composed of
 the machine's IP address followed by the machine's architecture, separated
 by a period. For example, a sun4c machine which has been assigned IP
-address 130.115.144.11, will make an TFTP request for a file that has 
+address 130.115.144.11, will make an TFTP request for a file that has
 been named in the nvram.  Normally, this file is a second-stage
 boot program, which should be located in a place where the TFTP daemon
 can find it (remember, many TFTP daemons run in a chroot'ed environment).
 You can find the boot program in `/usr/mdec/netboot' in the OpenBSD/mvme88k
-distribution. 
+distribution.
 
 After the boot program has been loaded into memory and given control by
 the PROM, it starts locating the machine's remote root directory through
@@ -67,7 +67,7 @@ you have several options when choosing a location to store the installation
 filesets. However, the easiest way is to put the *.tgz files you want
 to install into the root directory for your client on the server.
 
-Next, unpack `base{:--:}OSrev.tgz' and `etc{:--:}OSrev.tgz' on the server in the root 
+Next, unpack `base{:--:}OSrev.tgz' and `etc{:--:}OSrev.tgz' on the server in the root
 directory for your machine. If you elect to use a separately NFS-mounted
 filesystem for `/usr' with your diskless setup, make sure the "./usr" base
 files in base{:--:}OSrev.tgz end up in the correct location. One way to do this is
@@ -156,13 +156,13 @@ the editor), then try setting it to `8 partitions:'.
 <BEGIN SAMPLE DISKLABEL SCREEN>
 OpenBSD# disklabel sd2
  # /dev/rsd2c:
-type: SCSI 
+type: SCSI
 disk: SCSI disk
 label: Hold Your Breath
 flags:
 bytes/sector: 512
 sectors/track: 64
-tracks/cylinder: 7  
+tracks/cylinder: 7
 sectors/cylinder: 448
 cylinders: 1429
 rpm: 3600
@@ -219,8 +219,8 @@ filesystem writable is
 
 Congratulations, you have successfully installed OpenBSD OSREV.  When you
 reboot into OpenBSD, you should log in as "root" at the login prompt.
-You should create yourself an account and protect it and the "root" account 
-with good passwords. 
+You should create yourself an account and protect it and the "root" account
+with good passwords.
 
 Some of the files in the OpenBSD OSREV distribution might need to be
 tailored for your site.  In particular, the /etc/mail/sendmail.cf file
diff --git a/distrib/notes/mvme88k/whatis b/distrib/notes/mvme88k/whatis
index a2ac0ee6578..d849cbb6ba5 100644
--- a/distrib/notes/mvme88k/whatis
+++ b/distrib/notes/mvme88k/whatis
@@ -1,6 +1,6 @@
-OpenBSD/mvme88k 2.3 was written because the MVME187 existed in a computer 
-company basement.  Nivas Madhur started the port.  Steve Murphree, Jr. 
-finished the port in December 1998.  Code by Dale Rahn, Theo de Raadt, 
-and Chuck Cranor was used as a starting point. Currently this port runs 
+OpenBSD/mvme88k 2.3 was written because the MVME187 existed in a computer
+company basement.  Nivas Madhur started the port.  Steve Murphree, Jr.
+finished the port in December 1998.  Code by Dale Rahn, Theo de Raadt,
+and Chuck Cranor was used as a starting point. Currently this port runs
 on MVME187 and perhaps other models also.
 
diff --git a/distrib/notes/mvme88k/xfer b/distrib/notes/mvme88k/xfer
index aee6dcca32b..04b1e075346 100644
--- a/distrib/notes/mvme88k/xfer
+++ b/distrib/notes/mvme88k/xfer
@@ -55,7 +55,7 @@ To prepare for installing via FTP:
 To prepare for installing via a tape:
 
 	To install OpenBSD from a tape, you need to somehow
-	make a boot tape on the appropriate kind of tape.  
+	make a boot tape on the appropriate kind of tape.
 	The files needed for this are:
 	
 	stboot 	  - The Motorola VID block
@@ -73,7 +73,7 @@ To prepare for installing via a tape:
 	that describes the tape drive you're using (possibly
 	something like /dev/nrst0, but we make no guarantees 8-).
 		
-	Now you need to get the OpenBSD filesets you wish to 
+	Now you need to get the OpenBSD filesets you wish to
 	install on your system on to the appropriate kind of tape,
 	in tar format.
 
@@ -92,5 +92,5 @@ To prepare for installing via a tape:
 	on the tape.
 
 	Once you have done this, you can proceed to the next
-	step in the installation process, preparing your 
+	step in the installation process, preparing your
 	system for OpenBSD installation.
diff --git a/distrib/notes/packages b/distrib/notes/packages
index d77c954a3e3..c3c25639a51 100644
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: packages,v 1.23 2002/04/14 02:34:38 miod Exp $
+dnl	$OpenBSD: packages,v 1.24 2002/06/09 05:53:54 todd Exp $
 As complete as your OpenBSD system is, you may want to add any of several
 excellent third party software applications.  There are several ways to do
 this.  You can:
@@ -207,7 +207,7 @@ Installing applications from the ftp.openbsd.org package collection:
 	ethereal-0.9.3-no_x11.tgz           ethereal-0.9.3.tgz
 	ettercap-0.6.4.tgz                  everybuddy-0.2.1beta6.tgz
 	exim-3.34-ldap.tgz                  exim-3.34-mysql.tgz
-	exim-3.34-no_x11-ldap.tgz           
+	exim-3.34-no_x11-ldap.tgz
 	exim-3.34-no_x11-mysql-postgresql-ldap.tgz
 	exim-3.34-no_x11-mysql.tgz          exim-3.34-no_x11-postgresql.tgz
 	exim-3.34-no_x11.tgz                exim-3.34-postgresql.tgz
@@ -599,7 +599,7 @@ Installing applications from the ftp.openbsd.org package collection:
 	perltidy-20010328.tgz               pgp-2.6.3.tgz
 	pgp-5.0i.tgz                        pgpdump-0.16.tgz
 	pgpsendmail-1.4.5.tgz               php3-3.0.18p2-gd.tgz
-	php3-3.0.18p2-imap-gd-mysql.tgz     
+	php3-3.0.18p2-imap-gd-mysql.tgz
 	php3-3.0.18p2-imap-gd-postgresql.tgz
 	php3-3.0.18p2-imap-mysql.tgz        php3-3.0.18p2-imap-postgresql.tgz
 	php3-3.0.18p2-imap.tgz              php3-3.0.18p2-mysql.tgz
@@ -611,7 +611,7 @@ Installing applications from the ftp.openbsd.org package collection:
 	php4-4.1.2-imap-ldap-no_x11-mysql.tgz
 	php4-4.1.2-imap-ldap-no_x11-postgresql.tgz
 	php4-4.1.2-imap-ldap-postgresql.tgz php4-4.1.2-imap-mysql.tgz
-	php4-4.1.2-imap-no_x11-mysql.tgz    
+	php4-4.1.2-imap-no_x11-mysql.tgz
 	php4-4.1.2-imap-no_x11-postgresql.tgz
 	php4-4.1.2-imap-postgresql.tgz      php4-4.1.2-imap.tgz
 	php4-4.1.2-ldap.tgz                 php4-4.1.2-mcrypt.tgz
@@ -930,7 +930,7 @@ Installing applications from the CD-ROM ports collection:
 
 	The CD-ROM ``ports'' collection is a set of Makefiles, patches,
 	and other files used to control the building and installation
-	of an application from source files.  
+	of an application from source files.
 
 	Creating an application from sources can require a lot of
 	disk space, sometimes 50 megabytes or more.  The first step is
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 3fba11ad40d..38fb730c4ec 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -2,7 +2,7 @@ TopPart
 
 OpenBSDminiroot
 				It can be copied to the swap partition of
-				an existing OpenBSD, NetBSD, Linux, SunOS, 
+				an existing OpenBSD, NetBSD, Linux, SunOS,
 				or Solaris installation to allow installing
 				or upgrading to OpenBSD OSREV
 
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 4c1c7c44b47..dac05f56071 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -29,7 +29,7 @@ OpenBSD/MACHINE OSREV does NOT run on these machines (yet):
 		XDBus and multiprocessor support issues.
 	- sun4u (Ultrasparcs)
 		These machines are supported by the OpenBSD/sparc64 port.
-	- clones that are significantly different from the Sun systems 
+	- clones that are significantly different from the Sun systems
 		(e.g. K-Bus based Solbourne)
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
@@ -40,17 +40,17 @@ around 16M of RAM, getting more RAM is more important than getting a
 faster CPU.)  Installation from "ramdisk" kernels requires 8M of RAM.
 
 Supported devices {:-include-:}:
-	sun4c and sun4m SBus video: 
+	sun4c and sun4m SBus video:
 		cgsix (GX, GX+, TGX, TGX+), cgthree, and bwtwo frame buffers
 
         sun4m on-board machine specific video:
                 TCX, cgfourteen (aka SX), p9100 (Tadpole 3GS, 3GX)
 
-	sun4 video (not thoroughly tested...): 
+	sun4 video (not thoroughly tested...):
 		P4  -- on-board bwtwo, cgfour, cgsix, cgeight
-                VME -- cgtwo, cgthree, cgsix 
+                VME -- cgtwo, cgthree, cgsix
 
-	serial ports: 
+	serial ports:
 		ttya and ttyb (can be used as console if needed),
                 ttyc and ttyd (Sun 4/300 only)
 		SBus magma serial port cards, including:
@@ -58,18 +58,18 @@ Supported devices {:-include-:}:
 			4+1Sp, 8+2Sp, and 2+1HS Sp.
 		SBus Serial Parallel Interface (SUNW,spif)
 
-	ethernet: 
-		on-board AMD Lance ethernet ("le0"), 
-		SBus AMD Lance ethernet cards, 
-		on-board Intel 82586 ethernet (ie0 on 4/100's and 4/200's), 
+	ethernet:
+		on-board AMD Lance ethernet ("le0"),
+		SBus AMD Lance ethernet cards,
+		on-board Intel 82586 ethernet (ie0 on 4/100's and 4/200's),
 		VME Intel 82586 ethernet cards
 		SBus SunSwift and Quad FastEthernet cards (hme, qfe)
 		SBus FastEthernet cards (qec+be)
 		SBus QuadEthernet cards (qec+qe)
 
-	SCSI: 
+	SCSI:
 		on-board "esp" SCSI controller (sun4c's, and the 4/300),
-		SBus "esp" SCSI controller (including 3rd party compatibles), 
+		SBus "esp" SCSI controller (including 3rd party compatibles),
 		Sun "SUN-3"/"si" VME SCSI controller (polled mode only, slow),
 		Sun "SCSI Weird"/"sw" on-board controller (4/110 only, polled)
 
@@ -98,7 +98,7 @@ Hardware the we do NOT currently support, but get many questions about:
 	Interrupt driven SCSI driver for Sun 4/100's and 4/200's
         VME mti 16-port serial card
         VME alm2 16-port serial card
-        VME mcp 4-port serial card 
+        VME mcp 4-port serial card
         VME IPI controller
         VME cgfive framebuffer
         VME cgnine framebuffer
@@ -110,9 +110,9 @@ Hardware the we do NOT currently support, but get many questions about:
 	Tadpole onboard PCMCIA and modem
 
 The supplied GENERIC kernel is the best attempt at a configuration that
-works on the widest range of machinery (sun4, sun4c, and sun4m).  
-If you have problems with the OpenBSD OSREV kernel in this distribution, 
-please visit the OpenBSD web page (http://www.openbsd.org) and the mailing 
+works on the widest range of machinery (sun4, sun4c, and sun4m).
+If you have problems with the OpenBSD OSREV kernel in this distribution,
+please visit the OpenBSD web page (http://www.openbsd.org) and the mailing
 lists to review the current status and check for updates and distribution
 errata.
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 45c18d79857..177ae470474 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.52 2002/04/17 23:32:12 miod Exp $
+dnl	$OpenBSD: install,v 1.53 2002/06/09 05:53:54 todd Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -46,13 +46,13 @@ There are four main cases:
 	OpenBoot Version 2 (newer servers, desktop workstations):
 		prompt is "ok", boot command is "boot" uses diskn:p syntax.
         OpenBoot Version 2 (certain newer desktop workstations):
-		prompt is "ok", boot command is "boot" uses diskn syntax 
+		prompt is "ok", boot command is "boot" uses diskn syntax
 		unless booting from a non-standard partition, in which case:
-		boot /sbus/esp/sd@t,0:p bsd  (where "t" is the scsi target, 
+		boot /sbus/esp/sd@t,0:p bsd  (where "t" is the scsi target,
 		and "p" is the partition.  examples would be t="3" and p="b")
 
 	
-If you expect your workstation to have an OpenBoot Prom but get a ">", 
+If you expect your workstation to have an OpenBoot Prom but get a ">",
 enter then "n" command to enter the "new command mode".  You can set this
 as the default by doing a "setenv sunmon-compat? false" command, followed
 by a "reset" command.
@@ -62,9 +62,9 @@ is described elsewhere in some detail.  For the purposes of this section,
 drive 0 refers to the internal or first SCSI drive, which usually has a
 SCSI-ID of 3.
 
- 
+
 Booting from Floppy Disk installation media:
- 
+
         ok boot fd()bsd         # for version 1 OpenBOOT ROMs
         ok boot floppy bsd      # for version 2 OpenBOOT ROMs
 
@@ -97,18 +97,18 @@ Boot the miniroot by typing the appropriate command at the PROM:
 	> b sd(,,1)bsd 			# for sun4 monitors*
 	ok boot sd(,,1)bsd 		# for version 1 OpenBOOT ROMs
 	ok boot disk:b bsd 		# for version 2 OpenBOOT ROMs
-	ok boot /sbus/esp/sd@3,0:b bsd  # for version 2 OpenBOOT ROMs 
+	ok boot /sbus/esp/sd@3,0:b bsd  # for version 2 OpenBOOT ROMs
 					# that won't take disk:p syntax.
 
 If you've loaded the miniroot onto some other disk than the default
 drive 0, modify the boot specifier accordingly, keeping in mind the
-drive vs. scsi-id shuffling and partition a=0, b=1... 
+drive vs. scsi-id shuffling and partition a=0, b=1...
 
         > b sd(0,10,1)bsd       # example - scsi target 2 on sun4 monitors*
 	ok boot sd(0,3,1)bsd	# example - scsi target 0 on v1 OpenBOOT ROM
 	ok boot disk3:b bsd     # example - scsi target 0 on v2 OpenBOOT ROM
-	ok boot /sbus/esp/sd@0,0:b bsd  # example - scsi target 0 on v2  
-					# OpenBOOT ROM that won't take 
+	ok boot /sbus/esp/sd@0,0:b bsd  # example - scsi target 0 on v2
+					# OpenBOOT ROM that won't take
 					# disk:p syntax.
 
 (*) for sun4 this is scsi-target*8+scsi-lun (usually 0) expressed in hex...
@@ -213,7 +213,7 @@ OpenBSDCommonURL
 After completing an installation:
 
 Now try a reboot.  (If needed, swap your scsi id's first).
-The Sun monitor normally tries to load a file called "vmunix".   
+The Sun monitor normally tries to load a file called "vmunix".
 On OpenBOOT ROM systems you can change it to load OpenBSD instead using
 the following commands:
 
@@ -226,7 +226,7 @@ On version 2 OpenBOOT ROMs:
     ok setenv boot-file bsd
     ok setenv boot-device /sbus/esp/sd@0,0
 
-On sun4 systems, you may not need to specify the boot file, as 
+On sun4 systems, you may not need to specify the boot file, as
 the OpenBSD boot blocks will look for "bsd" on the boot device by default.
 
 OpenBSDCongratulations
@@ -236,10 +236,10 @@ need to edit /etc/ttys and change the terminal type, and getty method from
 "sun" and "suncons" to "vt100" and "std.9600" or something similar.  Also
 when running from a serial console, you may wish to adjust the eeprom
 settings for input-device, output-device, screen-#columns, and screen-#rows
-as appropriate.  
+as appropriate.
 
 In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
-and add "local" to the end of the tty configuration line, and run 
+and add "local" to the end of the tty configuration line, and run
 'ttyflags -a' to put your changes into effect.
 
 
@@ -278,7 +278,7 @@ Use SunOS to newfs the partitions which will have filesystems on them.
 
     sunos# newfs /dev/rsd0a
     [... lots of output]
- 
+
 Repeat for any other partition (in this example, /dev/rsd0d, /dev/rsd0f,
 /dev/rsd0g, /dev/rsd0h).
 
@@ -370,7 +370,7 @@ Use Solaris to newfs the partitions which will have filesystems on them.
 
     solaris# newfs /dev/rdsk/c0t1d0s0
     [... lots of output]
- 
+
 Repeat for any other partition (in this example, /dev/rdsk/c0t1d0s3,
 /dev/rdsk/c0t1d0s4, /dev/rdsk/c0t1d0s5 and /dev/rdsk/c0t1d0s6).
 
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
index fe41b30366d..059f7b4061d 100644
--- a/distrib/notes/sparc/prep
+++ b/distrib/notes/sparc/prep
@@ -55,8 +55,8 @@ instead of `ok', type:
     ok
 
 This is needed because OpenBSD relies on the behaviour of the "new" command
-mode.  OpenBSD will not boot correctly on sun4c or sun4m systems that 
-are not running in "new" command mode.  The sun4 systems such as the 4/110, 
+mode.  OpenBSD will not boot correctly on sun4c or sun4m systems that
+are not running in "new" command mode.  The sun4 systems such as the 4/110,
 4/200, and 4/300 system do not have a "new" command mode, and will work
 fine as-is.
 
@@ -86,7 +86,7 @@ both OpenBSD and SunOS environments on the same system.
 
     You should avoid using soft updates (option softdep in /etc/fstab)
     on your shared filesystems.
-    Although untested, it is likely that SunOS would be confused by a 
+    Although untested, it is likely that SunOS would be confused by a
     filesystem with soft update flags enabled.
 
 The OpenBSD "Sun Compatible" disklabel have been extended to support 16
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index 78b58f993ba..ca4a9b12000 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.28 2002/05/29 01:52:47 fgsch Exp $
+dnl	$OpenBSD: hardware,v 1.29 2002/06/09 05:53:55 todd Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
@@ -39,7 +39,7 @@ To install the entire system requires much more disk space, and to run
 X or compile the system, more RAM is recommended.
 
 Supported devices {:-include-:}:
-	SCSI Host Adapters: 
+	SCSI Host Adapters:
 		SBus NCR53c9x adapters (esp)
 		SBus 10/100Mbit SunSwift Ethernet+SCSI cards, aka HME + FAS366
 		  cards (esp)
@@ -66,7 +66,7 @@ Supported devices {:-include-:}:
 		PCI GEM Ethernet (gem)
 		PCI Davicom DM9102 Ethernet (dc)
 
-	Serial ports: 
+	Serial ports:
 		onboard SBUS Zilog 8530 (zs)
 		onboard EBUS Infineon (Siemens) 82532 (sab)
 		onboard 16550 compatibles (com)
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 84604e1a7be..b9c96916ea0 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.24 2002/04/17 23:32:12 miod Exp $
+dnl	$OpenBSD: install,v 1.25 2002/06/09 05:53:55 todd Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -65,7 +65,7 @@ Boot the miniroot by typing the appropriate command at the PROM:
 
 If you've loaded the miniroot onto some other disk than the default
 drive 0, modify the boot specifier accordingly, keeping in mind the
-partition naming a=0, b=1... 
+partition naming a=0, b=1...
 
 	ok boot disk1:b bsd     # example - scsi target 1 or
 				# second ide drive
@@ -190,10 +190,10 @@ need to edit /etc/ttys and change the terminal type, and getty method from
 "sun" and "suncons" to "vt100" and "std.9600" or something similar.  Also
 when running from a serial console, you may wish to adjust the eeprom
 settings for input-device, output-device, screen-#columns, and screen-#rows
-as appropriate.  
+as appropriate.
 
 In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
-and add "local" to the end of the tty configuration line, and run 
+and add "local" to the end of the tty configuration line, and run
 'ttyflags -a' to put your changes into effect.
 
 
@@ -232,7 +232,7 @@ Use Solaris to newfs the partitions which will have filesystems on them.
 
     solaris# newfs /dev/rdsk/c0t1d0s0
     [... lots of output]
- 
+
 Repeat for any other partition (in this example, /dev/rdsk/c0t1d0s3,
 /dev/rdsk/c0t1d0s4, /dev/rdsk/c0t1d0s5 and /dev/rdsk/c0t1d0s6).
 
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index c983585866b..35a090c396a 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2002/04/17 23:32:12 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2002/06/09 05:53:55 todd Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -145,7 +145,7 @@ need to edit /etc/ttys and change the terminal type, and getty method from
 "sun" and "console" to "vt100" and "std.9600" or something similar.
 
 In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
-and add "local" to the end of the tty configuration line, and run 
+and add "local" to the end of the tty configuration line, and run
 'ttyflags -a' to put your changes into effect.
 
 
@@ -183,7 +183,7 @@ Use SunOS to newfs the partitions which will have filesystems on them.
 
     sunos# newfs /dev/rsd0a
     [... lots of output]
- 
+
 Repeat for any other partition (in this example, /dev/rsd0d, /dev/rsd0f,
 /dev/rsd0g, /dev/rsd0h).
 
diff --git a/distrib/notes/sun3/prep b/distrib/notes/sun3/prep
index bcd713f056a..b5be2832fbc 100644
--- a/distrib/notes/sun3/prep
+++ b/distrib/notes/sun3/prep
@@ -43,7 +43,7 @@ both OpenBSD and SunOS environments on the same system.
 
     You should avoid using softupdates (option softdep in /etc/fstab)
     on your shared filesystems.
-    Although untested, it is likely that SunOS would be confused by a 
+    Although untested, it is likely that SunOS would be confused by a
     filesystem with soft update flags enabled.
 
 The OpenBSD "Sun Compatible" disklabel have been extended to support 16
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index 68f481ac690..1b336e7a57b 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -8,7 +8,7 @@ OpenBSDrd
 
 OpenBSDfloppy
 
-		boot.mop	MOP-bootable image (for network installs); 
+		boot.mop	MOP-bootable image (for network installs);
 				see below.
 
 OpenBSDfloppydesc(single,The)
diff --git a/distrib/notes/vax/hardware b/distrib/notes/vax/hardware
index ee4aa688ed2..b4789e0212d 100644
--- a/distrib/notes/vax/hardware
+++ b/distrib/notes/vax/hardware
@@ -18,8 +18,8 @@ The following systems have been tested:
 	- VAX 4000-{4,5,6}00{,A}
 
 Ethernet devices:
-	- on-board MicroVAX or VAXstation LANCE 
-	- DEC SGEC 
+	- on-board MicroVAX or VAXstation LANCE
+	- DEC SGEC
 
 SCSI:
 	- NCR 5380 or NCR 53C9x on-board SCSI is generally supported
@@ -32,6 +32,6 @@ Serial ports:
 The lowest amount of memory tested is 6M; however, more is recommended.
 At the moment, the only supported console is a serial console.
 
-Currently, your only storage options for using OpenBSD/MACHINE are SCSI 
-disks or tapes on one of the supported controllers, or a NFS root and 
+Currently, your only storage options for using OpenBSD/MACHINE are SCSI
+disks or tapes on one of the supported controllers, or a NFS root and
 swap.  Please see below for details.
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index f895ea8f5f3..deacdcb308b 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.12 2002/05/23 01:58:36 hugh Exp $
+dnl	$OpenBSD: install,v 1.13 2002/06/09 05:53:55 todd Exp $
 OpenBSDInstallPrelude
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -41,7 +41,7 @@ entry in /etc/hosts.
 Then start rarpd (or configure /etc/rc.conf to always start rarpd).
 
 Copy boot.mop into /tftpboot/mop/1a2b3c4d5e6f.SYS, where "1a2b3c4d5e6f"
-represents the six octets of your ethernet address.  For example, the 
+represents the six octets of your ethernet address.  For example, the
 filename for the machine described above would be "08002b247200.SYS".
 Note that all non alphanumeric characters must be stripped and the
 mac portion must be lower case, the extension upper.  Start mopd by
@@ -67,9 +67,9 @@ For example:
 Enable rpc.bootparamd either by turning it on in /etc/rc.conf and rebooting,
 or by running it manually.
 
-You are now ready to mopboot your MACHINE. 
+You are now ready to mopboot your MACHINE.
 
-Typing "B <DEVICE>", where <DEVICE> is your VAX's ethernet device, at the 
+Typing "B <DEVICE>", where <DEVICE> is your VAX's ethernet device, at the
 chevron prompt should then load the OpenBSD booter.
 
 
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index ff3be90b46d..1c61e3e2d24 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2002/05/20 16:23:54 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.11 2002/06/09 05:53:55 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -72,7 +72,7 @@ do_prep:
 do_mount:
 	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
- 
+
 do_umount:
 	@echo ""
 	@df -i ${MOUNT_POINT}
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 1fc4aeba9fd..ccc5c41e536 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2002/05/19 08:56:58 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2002/06/09 05:53:55 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -88,7 +88,7 @@ bsd:
 	    make clean && make depend && COPTS=-Os make
 	cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd
 
-rd_setup: 
+rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${IMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index a7fa9ab015d..9ac26a7acf1 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2002/05/19 08:56:58 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/06/09 05:53:55 todd Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -88,7 +88,7 @@ bsd:
 	    make clean && make depend && COPTS=-Os make
 	cp ${TOP}/../../sys/arch/sparc64/compile/${KERNEL}/bsd bsd
 
-rd_setup: 
+rd_setup:
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${IMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
diff --git a/distrib/special/init/Makefile b/distrib/special/init/Makefile
index bcaacd0fcb0..ea78f352164 100644
--- a/distrib/special/init/Makefile
+++ b/distrib/special/init/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2000/08/06 00:16:01 millert Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/06/09 05:53:55 todd Exp $
 
 PROG=	init
 MAN=
 COPTS+=-Os
 CFLAGS+=-DDEFAULT_STATE=single_user
-DPADD=	${LIBUTIL} 
-LDADD=	-lutil 
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 .PATH:  ${.CURDIR}/../../../sbin/init
 
 .include <bsd.prog.mk>
diff --git a/distrib/vax/rx33/Makefile b/distrib/vax/rx33/Makefile
index 5a51be558ff..43c1b120dd6 100644
--- a/distrib/vax/rx33/Makefile
+++ b/distrib/vax/rx33/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2000/03/01 22:10:14 todd Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/06/09 05:53:55 todd Exp $
 #	$NetBSD: Makefile,v 1.1 1995/10/01 21:22:40 ragge Exp $
 #
 #	Create RX33 floppies.
@@ -11,5 +11,5 @@ all:
 	dd if=../inst/miniroot-${REV}.fs of=rx33-copy2-${REV} \
 		bs=512 skip=2400 count=2400
 
-.include <bsd.obj.mk>  
+.include <bsd.obj.mk>
 .include <bsd.subdir.mk>