Attempt at cleanup.

93 files changed, 190 insertions, 169 deletions

diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 01b60e9e9c5..2f96a4b4a11 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chio.1,v 1.2 1996/06/23 14:19:03 deraadt Exp $
+.\"	$OpenBSD: chio.1,v 1.3 1996/10/08 01:19:58 michaels Exp $
 .\"	$NetBSD: chio.1,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@@ -33,7 +33,7 @@
 .\"
 .Dd April 2, 1996
 .Dt CHIO 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm chio
 .Nd medium changer control utility
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index b68b535caef..75478034388 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -27,11 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ld.1,v 1.3 1996/09/20 09:53:39 deraadt Exp $
+.\"	$Id: ld.1,v 1.4 1996/10/08 01:20:02 michaels Exp $
 .\"
 .Dd October 14, 1993
 .Dt LD 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ld
 .Nd link editor
diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.8 b/gnu/usr.bin/ld/ldconfig/ldconfig.8
index d361ee3adf7..e12ac133911 100644
--- a/gnu/usr.bin/ld/ldconfig/ldconfig.8
+++ b/gnu/usr.bin/ld/ldconfig/ldconfig.8
@@ -27,11 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ldconfig.8,v 1.1 1995/10/18 08:40:56 deraadt Exp $
+.\"	$Id: ldconfig.8,v 1.2 1996/10/08 01:20:03 michaels Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ldconfig
 .Nd configure the shared library cache
diff --git a/gnu/usr.bin/ld/ldd/ldd.1 b/gnu/usr.bin/ld/ldd/ldd.1
index 749d8333979..c8bb14aff94 100644
--- a/gnu/usr.bin/ld/ldd/ldd.1
+++ b/gnu/usr.bin/ld/ldd/ldd.1
@@ -30,7 +30,7 @@
 .\"
 .Dd October 22, 1993
 .Dt LDD 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ldd
 .Nd list dynamic object dependencies
diff --git a/gnu/usr.bin/ld/rtld/rtld.1 b/gnu/usr.bin/ld/rtld/rtld.1
index 1b4e7320632..1169eba98b6 100644
--- a/gnu/usr.bin/ld/rtld/rtld.1
+++ b/gnu/usr.bin/ld/rtld/rtld.1
@@ -30,7 +30,7 @@
 .\"
 .Dd June 27, 1995
 .Dt RTLD 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ld.so
 .Nd run-time link-editor
diff --git a/lib/libarch/i386/i386_get_ioperm.2 b/lib/libarch/i386/i386_get_ioperm.2
index 87e2fb0cdb7..311cfddbb69 100644
--- a/lib/libarch/i386/i386_get_ioperm.2
+++ b/lib/libarch/i386/i386_get_ioperm.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: i386_get_ioperm.2,v 1.3 1996/03/19 23:14:58 niklas Exp $
+.\"	$OpenBSD: i386_get_ioperm.2,v 1.4 1996/10/08 01:20:05 michaels Exp $
 .\"	$NetBSD: i386_get_ioperm.2,v 1.3 1996/02/27 22:57:17 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 .\"
 .Dd October 14, 1995
 .Dt I386_GET_IOPERM 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm i386_get_ioperm ,
 .Nm i386_set_ioperm
diff --git a/lib/libarch/i386/i386_get_ldt.2 b/lib/libarch/i386/i386_get_ldt.2
index ef29887af11..8e4ea5b65ed 100644
--- a/lib/libarch/i386/i386_get_ldt.2
+++ b/lib/libarch/i386/i386_get_ldt.2
@@ -34,7 +34,7 @@
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm i386_get_ldt ,
 .Nm i386_set_ldt
diff --git a/lib/libarch/i386/i386_iopl.2 b/lib/libarch/i386/i386_iopl.2
index df32eacec62..c253f030a7c 100644
--- a/lib/libarch/i386/i386_iopl.2
+++ b/lib/libarch/i386/i386_iopl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: i386_iopl.2,v 1.4 1996/06/16 13:55:01 deraadt Exp $
+.\"	$OpenBSD: i386_iopl.2,v 1.5 1996/10/08 01:20:06 michaels Exp $
 .\"	$NetBSD: i386_iopl.2,v 1.3 1996/02/27 22:57:25 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 .\"
 .Dd October 14, 1995
 .Dt I386_IOPL 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm i386_iopl
 .Nd change the i386 I/O privilege level
diff --git a/lib/libarch/i386/i386_vm86.2 b/lib/libarch/i386/i386_vm86.2
index 52db5bbeb90..3f34330bc8e 100644
--- a/lib/libarch/i386/i386_vm86.2
+++ b/lib/libarch/i386/i386_vm86.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: i386_vm86.2,v 1.1 1996/03/19 23:15:02 niklas Exp $
+.\"	$OpenBSD: i386_vm86.2,v 1.2 1996/10/08 01:20:07 michaels Exp $
 .\"	$NetBSD: i386_vm86.2,v 1.1 1996/02/21 00:21:52 jtk Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 .\"
 .Dd February 20, 1996
 .Dt I386_VM86 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm i386_vm86
 .Nd set virtual 8086 processor registers and mode
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index a456ed213a9..787a241a856 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setproctitle.3,v 1.3 1996/09/20 07:17:00 deraadt Exp $
+.\"	$OpenBSD: setproctitle.3,v 1.4 1996/10/08 01:20:08 michaels Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Christopher G. Demetriou
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\"
 .Dd "April 13, 1994"
 .Dt SETPROCTITLE 3
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm setproctitle
 .Nd set process title
diff --git a/lib/libc/md/mdX.3 b/lib/libc/md/mdX.3
index c20eb7d0eec..48c643b9cd4 100644
--- a/lib/libc/md/mdX.3
+++ b/lib/libc/md/mdX.3
@@ -6,11 +6,11 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $OpenBSD: mdX.3,v 1.2 1996/08/04 21:31:34 millert Exp $
+.\" $OpenBSD: mdX.3,v 1.3 1996/10/08 01:20:08 michaels Exp $
 .\"
 .Dd July 14, 1994
 .Dt MDX 3
-.Os FreeBSD 2
+.Os
 .Sh NAME
 .Nm MDXInit ,
 .Nm MDXUpdate ,
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 191239f9edc..a5586339d05 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: ethers.3,v 1.4 1996/08/19 08:28:35 tholo Exp $
+.\"	$OpenBSD: ethers.3,v 1.5 1996/10/08 01:20:09 michaels Exp $
 .\"
 .\" Written by roland@frob.com.  Public domain.
 .\"
 .Dd December 16, 1993
 .Dt ETHERS 3
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ether_aton ,
 .Nm ether_ntoa ,
diff --git a/lib/libc/sys/msgctl.2 b/lib/libc/sys/msgctl.2
index b7b84ee5520..e3c609797a2 100644
--- a/lib/libc/sys/msgctl.2
+++ b/lib/libc/sys/msgctl.2
@@ -31,7 +31,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt MSGCTL 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm msgctl
 .Nd message control operations
diff --git a/lib/libc/sys/msgget.2 b/lib/libc/sys/msgget.2
index 6952927dc5c..40fb7932ff3 100644
--- a/lib/libc/sys/msgget.2
+++ b/lib/libc/sys/msgget.2
@@ -31,7 +31,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt MSGGET 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm msgget
 .Nd get message queue
diff --git a/lib/libc/sys/msgrcv.2 b/lib/libc/sys/msgrcv.2
index ca7814bfaeb..399c8cac53b 100644
--- a/lib/libc/sys/msgrcv.2
+++ b/lib/libc/sys/msgrcv.2
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: msgrcv.2,v 1.2 1996/10/08 01:20:11 michaels Exp $
 .\"	$NetBSD: msgrcv.2,v 1.1 1995/10/16 23:49:20 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt MSGRCV 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm msgrcv
 .Nd receive a message from a message queue
diff --git a/lib/libc/sys/msgsnd.2 b/lib/libc/sys/msgsnd.2
index 54a0a069519..83c2edc5f82 100644
--- a/lib/libc/sys/msgsnd.2
+++ b/lib/libc/sys/msgsnd.2
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: msgsnd.2,v 1.2 1996/10/08 01:20:11 michaels Exp $
 .\"	$NetBSD: msgsnd.2,v 1.1 1995/10/16 23:49:24 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt MSGSND 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm msgsnd
 .Nd send a message to a message queue
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 6a96eaa0ab5..b3590325cb5 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: ptrace.2,v 1.2 1996/03/19 23:15:18 niklas Exp $
+.\"	$OpenBSD: ptrace.2,v 1.3 1996/10/08 01:20:12 michaels Exp $
 .\"	$NetBSD: ptrace.2,v 1.3 1996/02/23 01:39:41 jtc Exp $
 .\"
 .\" This file is in the public domain.
 .Dd November 7, 1994
 .Dt PTRACE 2
-.Os NetBSD 1.0BETA
+.Os
 .Sh NAME
 .Nm ptrace
 .Nd process tracing and debugging
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 30da8fa6606..ee2829c9e27 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: reboot.2,v 1.2 1996/10/08 01:20:13 michaels Exp $
 .\"	$NetBSD: reboot.2,v 1.5 1995/02/27 12:36:02 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -64,7 +65,7 @@ The default, causing the system to reboot in its usual fashion.
 Interpreted by the bootstrap program itself, causing it to
 prompt on the console as to what file should be booted.
 Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)netbsd ,
+.Dq Em xx Ns No (0,0)bsd ,
 where
 .Em xx
 is the default disk name,
@@ -125,7 +126,7 @@ program in the newly booted system.
 When no options are given (i.e.,
 .Dv RB_AUTOBOOT
 is used), the system is
-rebooted from file ``netbsd'' in the root file system of unit 0
+rebooted from file ``bsd'' in the root file system of unit 0
 of a disk chosen in a processor specific way.
 An automatic consistency check of the disks is normally performed
 (see
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index d3ff3888a4d..23da10c56df 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: semctl.2,v 1.2 1996/10/08 01:20:13 michaels Exp $
 .\"	$NetBSD: semctl.2,v 1.1 1995/10/16 23:49:26 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SEMCTL 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm semctl
 .Nd semaphore control operations
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index c05bfd88c73..e293904b157 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: semget.2,v 1.2 1996/10/08 01:20:14 michaels Exp $
 .\"	$NetBSD: semget.2,v 1.1 1995/10/16 23:49:27 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SEMGET 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm semget
 .Nd get semaphore set
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 28eeb7daf68..9c75b4a6059 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: semop.2,v 1.2 1996/10/08 01:20:14 michaels Exp $
 .\"	$NetBSD: semop.2,v 1.1 1995/10/16 23:49:28 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SEMOP 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm semop
 .Nd semaphore operations
@@ -149,4 +150,4 @@ points to an illegal address.
 .Sh BUGS
 In case of a removed semaphore identifier,
 .Va errno
-should be set to EIDRM, but NetBSD does not define this error.
+should be set to EIDRM, but OpenBSD does not define this error.
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 1f845596faa..7ed9d04490b 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: shmat.2,v 1.2 1996/10/08 01:20:15 michaels Exp $
 .\"	$NetBSD: shmat.2,v 1.1 1995/10/16 23:49:29 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SHMAT 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm shmat ,
 .Nm shmdt
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index fbb33ab0e31..036db38b3e9 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: shmctl.2,v 1.2 1996/10/08 01:20:15 michaels Exp $
 .\"	$NetBSD: shmctl.2,v 1.1 1995/10/16 23:49:30 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SHMCTL 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm shmctl
 .Nd shared memory control operations
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index 76fd0588823..55ad6fbdd77 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: shmget.2,v 1.2 1996/10/08 01:20:16 michaels Exp $
 .\"	$NetBSD: shmget.2,v 1.1 1995/10/16 23:49:32 jtc Exp $	
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -31,7 +32,7 @@
 .\"/
 .Dd August 17, 1995
 .Dt SHMGET 2
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm shmget
 .Nd get shared memory area identifier
diff --git a/lib/libkvm.old/kvm_nlist.3 b/lib/libkvm.old/kvm_nlist.3
index 03842cfc985..f0bd662d232 100644
--- a/lib/libkvm.old/kvm_nlist.3
+++ b/lib/libkvm.old/kvm_nlist.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_nlist.3,v 1.1 1996/03/19 23:15:37 niklas Exp $
+.\"	$OpenBSD: kvm_nlist.3,v 1.2 1996/10/08 01:20:16 michaels Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -73,8 +73,8 @@ The
 function returns the number of invalid entries found.
 If the kernel symbol table was unreadable, -1 is returned.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_netbsd.db -compact
-.It Pa /var/db/kvm_netbsd.db
+.Bl -tag -width /var/db/kvm_openbsd.db -compact
+.It Pa /var/db/kvm_openbsd.db
 .El
 .Sh SEE ALSO
 .Xr kvm 3 ,
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index 8ef654e5b08..68fcc4ca4a5 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_nlist.3,v 1.2 1996/05/05 14:57:30 deraadt Exp $
+.\"	$OpenBSD: kvm_nlist.3,v 1.3 1996/10/08 01:20:17 michaels Exp $
 .\"	$NetBSD: kvm_nlist.3,v 1.3 1996/03/18 22:33:48 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -74,8 +74,8 @@ The
 function returns the number of invalid entries found.
 If the kernel symbol table was unreadable, -1 is returned.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_netbsd.db -compact
-.It Pa /var/db/kvm_netbsd.db
+.Bl -tag -width /var/db/kvm_openbsd.db -compact
+.It Pa /var/db/kvm_openbsd.db
 .El
 .Sh SEE ALSO
 .Xr kvm 3 ,
diff --git a/lib/libutil/getmaxpartitions.3 b/lib/libutil/getmaxpartitions.3
index 426c53e0928..7d151cad060 100644
--- a/lib/libutil/getmaxpartitions.3
+++ b/lib/libutil/getmaxpartitions.3
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: getmaxpartitions.3,v 1.2 1996/10/08 01:20:18 michaels Exp $
 .\"	$NetBSD: getmaxpartitions.3,v 1.1 1996/05/16 07:03:30 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -36,7 +37,7 @@
 .\"
 .Dd May 15, 1996
 .Dt GETMAXPARTITIONS 3
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm getmaxpartitions
 .Nd get the maximum number of partitions allowed per disk
diff --git a/lib/libutil/getrawpartition.3 b/lib/libutil/getrawpartition.3
index 290d4a34f87..db6c32bbda0 100644
--- a/lib/libutil/getrawpartition.3
+++ b/lib/libutil/getrawpartition.3
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: getrawpartition.3,v 1.2 1996/10/08 01:20:18 michaels Exp $
 .\"	$NetBSD: getrawpartition.3,v 1.1 1996/05/16 07:03:32 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -36,7 +37,7 @@
 .\"
 .Dd May 15, 1996
 .Dt GETRAWPARTITION 3
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm getrawpartition
 .Nd get the system
diff --git a/libexec/atrun/atrun.8 b/libexec/atrun/atrun.8
index b61b9869e34..33390e348dc 100644
--- a/libexec/atrun/atrun.8
+++ b/libexec/atrun/atrun.8
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: atrun.8,v 1.2 1996/10/08 01:20:19 michaels Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -27,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: atrun.8,v 1.1 1995/10/18 08:43:14 deraadt Exp $
+.\"	$Id: atrun.8,v 1.2 1996/10/08 01:20:19 michaels Exp $
 .\"
 .Dd December 5, 1993
 .Dt ATRUN 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm atrun
 .Nd run jobs queued for later execution
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 1b2e769d723..c5ea3aad494 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.8
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: rpc.rquotad.8,v 1.2 1996/10/08 01:20:20 michaels Exp $
 .\" 
 .\" Copyright (c) 1994 Theo de Raadt
 .\" All rights reserved.
@@ -27,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rquotad.8,v 1.1 1995/10/18 08:43:20 deraadt Exp $
+.\"	$Id: rpc.rquotad.8,v 1.2 1996/10/08 01:20:20 michaels Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
@@ -54,6 +55,6 @@ is normally invoked by
 uses an RPC protocol defined in
 .Pa /usr/include/rpcsvc/rquota.x .
 .Sh BUGS
-BSD 4.4 and NetBSD support group quotas but the rquota protocol does not.
+BSD 4.4 and OpenBSD support group quotas but the rquota protocol does not.
 .Sh SEE ALSO
 .Xr quota 1
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index 7a84973ac5d..052872cde0f 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: tftpd.8,v 1.2 1996/10/08 01:20:21 michaels Exp $
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)tftpd.8	6.7 (Berkeley) 5/13/91
-.\"	$Id: tftpd.8,v 1.1 1995/10/18 08:43:25 deraadt Exp $
+.\"	$Id: tftpd.8,v 1.2 1996/10/08 01:20:21 michaels Exp $
 .\"
 .Dd May 13, 1991
 .Dt TFTPD 8
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index d34cdb519f2..a4fd8bc1504 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ccdconfig.8,v 1.4 1996/07/08 22:09:30 ccappuc Exp $
+.\"	$OpenBSD: ccdconfig.8,v 1.5 1996/10/08 01:20:22 michaels Exp $
 .\"	$NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ccdconfig
 .Nd configuration utility for the concatenated disk driver
diff --git a/sbin/fsck_msdos/fsck_msdos.8 b/sbin/fsck_msdos/fsck_msdos.8
index ad781297351..d32c49ded12 100644
--- a/sbin/fsck_msdos/fsck_msdos.8
+++ b/sbin/fsck_msdos/fsck_msdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsck_msdos.8,v 1.2 1996/06/23 14:30:44 deraadt Exp $
+.\"	$OpenBSD: fsck_msdos.8,v 1.3 1996/10/08 01:20:23 michaels Exp $
 .\"	$NetBSD: fsck_msdos.8,v 1.1 1996/05/14 17:39:35 ws Exp $
 .\"
 .\" Copyright (C) 1995 Wolfgang Solfrank
@@ -34,7 +34,7 @@
 .\"
 .Dd August 13, 1995
 .Dt FSCK_MSDOS 8
-.Os NetBSD 1.1a
+.Os
 .Sh NAME
 .Nm fsck_msdos
 .Nd DOS/Windows (FAT) filesystem consistency checker
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 454d9e8cfaf..8754a89569c 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsdb.8,v 1.3 1996/03/21 00:15:42 niklas Exp $
+.\"	$OpenBSD: fsdb.8,v 1.4 1996/10/08 01:20:24 michaels Exp $
 .\"	$NetBSD: fsdb.8,v 1.4 1996/02/27 22:28:09 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm fsdb
 .Nd FFS debugging/editing tool
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 78ecebbfd60..84b1d442691 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modload.8,v 1.4 1996/08/05 11:01:15 mickey Exp $
+.\"	$OpenBSD: modload.8,v 1.5 1996/10/08 01:20:24 michaels Exp $
 .\"	$NetBSD: modload.8,v 1.5 1995/03/18 14:56:43 cgd Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -28,7 +28,7 @@
 .\"
 .Dd June 7, 1993
 .Dt MODLOAD 8
-.Os NetBSD 0.8a
+.Os
 .Sh NAME
 .Nm modload
 .Nd load a kernel module
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index aed604859a9..cf513cf202e 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modunload.8,v 1.3 1996/06/23 14:31:07 deraadt Exp $
+.\"	$OpenBSD: modunload.8,v 1.4 1996/10/08 01:20:25 michaels Exp $
 .\"	$NetBSD: modunload.8,v 1.3 1995/03/18 14:56:49 cgd Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -28,7 +28,7 @@
 .\"
 .Dd June 7, 1993
 .Dt MODUNLOAD 8
-.Os NetBSD 0.8a
+.Os
 .Sh NAME
 .Nm modunload
 .Nd unload a kernel module
diff --git a/sbin/mount_ados/mount_ados.8 b/sbin/mount_ados/mount_ados.8
index 3c4e0e07802..2b4effa552f 100644
--- a/sbin/mount_ados/mount_ados.8
+++ b/sbin/mount_ados/mount_ados.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_ados.8,v 1.2 1996/06/23 14:31:14 deraadt Exp $
+.\"	$OpenBSD: mount_ados.8,v 1.3 1996/10/08 01:20:26 michaels Exp $
 .\"	$NetBSD: mount_ados.8,v 1.3 1995/03/18 14:57:09 cgd Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_ADOS 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm mount_ados
 .Nd mount an AmigaDOS file system
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index d3edb84a148..266bd2ab326 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_msdos.8,v 1.4 1996/06/23 14:31:26 deraadt Exp $
+.\"	$OpenBSD: mount_msdos.8,v 1.5 1996/10/08 01:20:27 michaels Exp $
 .\"	$NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $
 .\"
 .\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm mount_msdos
 .Nd mount an MS-DOS file system
diff --git a/sbin/ttyflags/ttyflags.8 b/sbin/ttyflags/ttyflags.8
index d772ef17036..e137abe22a2 100644
--- a/sbin/ttyflags/ttyflags.8
+++ b/sbin/ttyflags/ttyflags.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ttyflags.8,v 1.3 1996/08/30 00:53:25 deraadt Exp $
+.\"	$OpenBSD: ttyflags.8,v 1.4 1996/10/08 01:20:28 michaels Exp $
 .\"	$NetBSD: ttyflags.8,v 1.2 1995/03/18 15:01:22 cgd Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
 .\"
 .Dd March 30, 1994
 .Dt TTYFLAGS 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm ttyflags
 .Nd set device-specific flags for terminals
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 4eae36396be..70b2dc4ccb0 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: ccd.4,v 1.3 1996/10/08 01:20:29 michaels Exp $
 .\"	$NetBSD: ccd.4,v 1.5 1995/10/09 06:09:09 thorpej Exp $
 .\"
 .\" Copyright (c) 1994 Jason Downs.
diff --git a/share/man/man4/ipl.4 b/share/man/man4/ipl.4
index 75f82ee9c1e..ce00ef1c311 100644
--- a/share/man/man4/ipl.4
+++ b/share/man/man4/ipl.4
@@ -15,14 +15,14 @@ format is as follows:
 .LP
 .nf
 struct ipl_ci   {
-        u_long  sec;    /* time when the packet was logged */
+        u_long  sec;      /* time when the packet was logged */
         u_long  usec;
-        u_long  plen;   /* length of packet data logged */
-        u_short hlen;   /* length of headers logged */
-        u_short rule;   /* rule number (for log ...) or 0 if result = log */
+        u_long  plen;     /* length of packet data logged */
+        u_short hlen;     /* length of headers logged */
+        u_short rule;     /* rule number (for log ...) or 0 if result = log */
         u_long  flags:24; /* XXX FIXME do we care about the extra bytes? */
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606))
-        u_long  filler:8;                       /* XXX FIXME do we care? */
+#if (defined(OpenBSD) && (OpenBSD <= 1991011) && (OpenBSD >= 199606))
+        u_long  filler:8; /* XXX FIXME do we care? */
         u_char  ifname[IFNAMSIZ];
 #else
         u_long  unit:8;
diff --git a/share/man/man4/man4.amiga/ae.4 b/share/man/man4/man4.amiga/ae.4
index fd3cd367536..0c9455d26da 100644
--- a/share/man/man4/man4.amiga/ae.4
+++ b/share/man/man4/man4.amiga/ae.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: ae.4,v 1.2 1996/10/08 01:20:31 michaels Exp $
 .\"	$NetBSD: ae.4,v 1.3 1995/10/07 18:09:11 chopps Exp $
 .\"
 .\" Copyright (c) 1995 Bernd Ernesti and Klaus Burkert. All rights reserved.
@@ -43,7 +44,7 @@
 .\"
 .\" The following requests are required for all man pages.
 .Dd Aug 1, 1995
-.Os NetBSD 1.0
+.Os
 .Dt AE 4 amiga
 .Sh NAME
 .Nm ae
diff --git a/share/man/man4/man4.amiga/afsc.4 b/share/man/man4/man4.amiga/afsc.4
index 1d583bd7363..c4ece210f20 100644
--- a/share/man/man4/man4.amiga/afsc.4
+++ b/share/man/man4/man4.amiga/afsc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: afsc.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: afsc.4,v 1.2 1996/10/08 01:20:32 michaels Exp $
 .\"
 .Dd July 23, 1995
-.Os NetBSD 1.0a
+.Os
 .Dt AFSC 4 amiga
 .Sh NAME
 .Nm afsc
diff --git a/share/man/man4/man4.amiga/ahsc.4 b/share/man/man4/man4.amiga/ahsc.4
index 2f3f7bfe968..9ecffa25206 100644
--- a/share/man/man4/man4.amiga/ahsc.4
+++ b/share/man/man4/man4.amiga/ahsc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ahsc.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: ahsc.4,v 1.2 1996/10/08 01:20:32 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt AHSC 4 amiga
 .Sh NAME
 .Nm ahsc
diff --git a/share/man/man4/man4.amiga/atzsc.4 b/share/man/man4/man4.amiga/atzsc.4
index e0a06a0c87c..e90a4c44d5d 100644
--- a/share/man/man4/man4.amiga/atzsc.4
+++ b/share/man/man4/man4.amiga/atzsc.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: atzsc.4,v 1.2 1996/10/08 01:20:33 michaels Exp $
 .\"
 .\" Copyright (c) 1994 Christian E. Hopps
 .\" All rights reserved.
@@ -27,10 +28,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: atzsc.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: atzsc.4,v 1.2 1996/10/08 01:20:33 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt ATZSC 4 amiga
 .Sh NAME
 .Nm atzsc
diff --git a/share/man/man4/man4.amiga/bah.4 b/share/man/man4/man4.amiga/bah.4
index af4d2b64b21..6892f625566 100644
--- a/share/man/man4/man4.amiga/bah.4
+++ b/share/man/man4/man4.amiga/bah.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: bah.4,v 1.2 1996/10/08 01:20:33 michaels Exp $
 .\"	$NetBSD: bah.4,v 1.2 1995/06/06 23:41:37 cgd Exp $
 .\"
 .\" Copyright (c) 1995 Ignatios Souvatzis
@@ -32,7 +33,7 @@
 
 .\" The following requests are required for all man pages.
 .Dd May 31, 1995
-.Os NetBSD 1.0
+.Os
 .Dt BAH 4 amiga
 .Sh NAME
 .Nm bah
diff --git a/share/man/man4/man4.amiga/console.4 b/share/man/man4/man4.amiga/console.4
index 7eb1c94ab78..0bfc161b162 100644
--- a/share/man/man4/man4.amiga/console.4
+++ b/share/man/man4/man4.amiga/console.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: console.4,v 1.2 1996/10/08 01:20:34 michaels Exp $
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -33,11 +34,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cons.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: console.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: console.4,v 1.2 1996/10/08 01:20:34 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt CONSOLE 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm console
 .Nd
diff --git a/share/man/man4/man4.amiga/ed.4 b/share/man/man4/man4.amiga/ed.4
index 3df0865e1e6..ac752d05e5a 100644
--- a/share/man/man4/man4.amiga/ed.4
+++ b/share/man/man4/man4.amiga/ed.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: ed.4,v 1.2 1996/10/08 01:20:35 michaels Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -27,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ed.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: ed.4,v 1.2 1996/10/08 01:20:35 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt ED 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm ed
 .Nd Ethernet driver for DP8390-based ethernet boards
diff --git a/share/man/man4/man4.amiga/es.4 b/share/man/man4/man4.amiga/es.4
index 38beb80dbf9..b914d51b703 100644
--- a/share/man/man4/man4.amiga/es.4
+++ b/share/man/man4/man4.amiga/es.4
@@ -1,3 +1,4 @@
+.\"   $OpenBSD: es.4,v 1.2 1996/10/08 01:20:35 michaels Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -27,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: es.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: es.4,v 1.2 1996/10/08 01:20:35 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt ES 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm es
 .Nd Ethernet driver for SMC91C90-based ethernet boards
diff --git a/share/man/man4/man4.amiga/gtsc.4 b/share/man/man4/man4.amiga/gtsc.4
index 233a63adf64..82dcf740178 100644
--- a/share/man/man4/man4.amiga/gtsc.4
+++ b/share/man/man4/man4.amiga/gtsc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: gtsc.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: gtsc.4,v 1.2 1996/10/08 01:20:36 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt GTSC 4 amiga
 .Sh NAME
 .Nm gtsc
diff --git a/share/man/man4/man4.amiga/intro.4 b/share/man/man4/man4.amiga/intro.4
index 538e9c6b901..51cce6bf4d8 100644
--- a/share/man/man4/man4.amiga/intro.4
+++ b/share/man/man4/man4.amiga/intro.4
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: intro.4,v 1.1 1995/10/18 08:44:26 deraadt Exp $
+.\"	$Id: intro.4,v 1.2 1996/10/08 01:20:37 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt INTRO 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm intro
 .Nd introduction to special files and hardware support
diff --git a/share/man/man4/man4.amiga/ite.4 b/share/man/man4/man4.amiga/ite.4
index 17baf64e355..ff86a030445 100644
--- a/share/man/man4/man4.amiga/ite.4
+++ b/share/man/man4/man4.amiga/ite.4
@@ -34,11 +34,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ite.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: ite.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: ite.4,v 1.2 1996/10/08 01:20:37 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt ITE 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm ite
 .Nd
diff --git a/share/man/man4/man4.amiga/le.4 b/share/man/man4/man4.amiga/le.4
index fcafaadadb5..f560689fb18 100644
--- a/share/man/man4/man4.amiga/le.4
+++ b/share/man/man4/man4.amiga/le.4
@@ -35,11 +35,11 @@
 .\"
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
-.\"	$Id: le.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: le.4,v 1.2 1996/10/08 01:20:38 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt LE 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm le
 .Nd Ethernet driver for AMD7990(LANCE)-based boards 
diff --git a/share/man/man4/man4.amiga/mem.4 b/share/man/man4/man4.amiga/mem.4
index 7d2d56491ca..735425af181 100644
--- a/share/man/man4/man4.amiga/mem.4
+++ b/share/man/man4/man4.amiga/mem.4
@@ -34,11 +34,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
-.\"	$Id: mem.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: mem.4,v 1.2 1996/10/08 01:20:38 michaels Exp $
 .\"
 .Dd June 5, 1993
 .Dt MEM 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm mem ,
 .Nm kmem
diff --git a/share/man/man4/man4.amiga/mfcs.4 b/share/man/man4/man4.amiga/mfcs.4
index a733dbe285d..8644f9bfcdd 100644
--- a/share/man/man4/man4.amiga/mfcs.4
+++ b/share/man/man4/man4.amiga/mfcs.4
@@ -33,11 +33,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: mfcs.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: mfcs.4,v 1.2 1996/10/08 01:20:39 michaels Exp $
 .\"
 .Dd July 23, 1995
 .Dt MFCS 4 amiga
-.Os NetBSD 1.0a
+.Os
 .Sh NAME
 .Nm mfcs
 .Nd
diff --git a/share/man/man4/man4.amiga/mgnsc.4 b/share/man/man4/man4.amiga/mgnsc.4
index 3a61eba2307..ab1e00695d7 100644
--- a/share/man/man4/man4.amiga/mgnsc.4
+++ b/share/man/man4/man4.amiga/mgnsc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: mgnsc.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: mgnsc.4,v 1.2 1996/10/08 01:20:40 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt MGNSC 4 amiga
 .Sh NAME
 .Nm mgnsc
diff --git a/share/man/man4/man4.amiga/qn.4 b/share/man/man4/man4.amiga/qn.4
index 61a8bb22bc1..bcc254bbd8f 100644
--- a/share/man/man4/man4.amiga/qn.4
+++ b/share/man/man4/man4.amiga/qn.4
@@ -42,7 +42,7 @@
 .\"
 .\" The following requests are required for all man pages.
 .Dd Oct 5, 1995
-.Os NetBSD 1.0
+.Os
 .Dt QN 4 amiga
 .Sh NAME
 .Nm qn
diff --git a/share/man/man4/man4.amiga/ser.4 b/share/man/man4/man4.amiga/ser.4
index 26124f6fdd6..5d333bcb625 100644
--- a/share/man/man4/man4.amiga/ser.4
+++ b/share/man/man4/man4.amiga/ser.4
@@ -33,11 +33,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: ser.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: ser.4,v 1.2 1996/10/08 01:20:41 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt SER 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm ser
 .Nd
diff --git a/share/man/man4/man4.amiga/wesc.4 b/share/man/man4/man4.amiga/wesc.4
index 90addfa8204..69b1ef51090 100644
--- a/share/man/man4/man4.amiga/wesc.4
+++ b/share/man/man4/man4.amiga/wesc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: wesc.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: wesc.4,v 1.2 1996/10/08 01:20:41 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt WESC 4 amiga
 .Sh NAME
 .Nm wesc
diff --git a/share/man/man4/man4.amiga/zssc.4 b/share/man/man4/man4.amiga/zssc.4
index b3d86c5b84c..2bebf3beea5 100644
--- a/share/man/man4/man4.amiga/zssc.4
+++ b/share/man/man4/man4.amiga/zssc.4
@@ -27,10 +27,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: zssc.4,v 1.1 1995/10/18 08:44:27 deraadt Exp $
+.\"	$Id: zssc.4,v 1.2 1996/10/08 01:20:42 michaels Exp $
 .\"
 .Dd August 31, 1994
-.Os NetBSD 1.0
+.Os
 .Dt ZSSC 4 amiga
 .Sh NAME
 .Nm zssc
diff --git a/share/man/man4/man4.arm32/com.4 b/share/man/man4/man4.arm32/com.4
index 2432b84fd0c..5fdbc97d3a4 100644
--- a/share/man/man4/man4.arm32/com.4
+++ b/share/man/man4/man4.arm32/com.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: com.4,v 1.1 1996/04/22 01:27:36 deraadt Exp $
+.\"	$OpenBSD: com.4,v 1.2 1996/10/08 01:20:43 michaels Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -35,11 +35,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: com.4,v 1.1 1996/04/22 01:27:36 deraadt Exp $
+.\"	$Id: com.4,v 1.2 1996/10/08 01:20:43 michaels Exp $
 .\"
 .Dd July 28, 1995
 .Dt COM 4 arm32
-.Os NetBSD 1.0a
+.Os
 .Sh NAME
 .Nm com
 .Nd
diff --git a/share/man/man4/man4.arm32/lpt.4 b/share/man/man4/man4.arm32/lpt.4
index b50d829e78d..55d7d66838b 100644
--- a/share/man/man4/man4.arm32/lpt.4
+++ b/share/man/man4/man4.arm32/lpt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpt.4,v 1.1 1996/04/22 01:27:50 deraadt Exp $
+.\"	$OpenBSD: lpt.4,v 1.2 1996/10/08 01:20:43 michaels Exp $
 .\"
 .\" Copyright (c) 1995 Mark Brinicombe
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -29,11 +29,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: lpt.4,v 1.1 1996/04/22 01:27:50 deraadt Exp $
+.\"	$Id: lpt.4,v 1.2 1996/10/08 01:20:43 michaels Exp $
 .\"
 .Dd July 29, 1995
 .Dt LPT 4 arm32
-.Os NetBSD 1.0a
+.Os
 .Sh NAME
 .Nm lpt
 .Nd
diff --git a/share/man/man4/man4.arm32/quadmouse.4 b/share/man/man4/man4.arm32/quadmouse.4
index 1107d37253c..f8a663b6c2f 100644
--- a/share/man/man4/man4.arm32/quadmouse.4
+++ b/share/man/man4/man4.arm32/quadmouse.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quadmouse.4,v 1.1 1996/04/22 01:28:00 deraadt Exp $
+.\"	$OpenBSD: quadmouse.4,v 1.2 1996/10/08 01:20:44 michaels Exp $
 .\"
 .\" Copyright (c) 1995 Mark Brinicombe
 .\" All rights reserved.
@@ -28,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: quadmouse.4,v 1.1 1996/04/22 01:28:00 deraadt Exp $
+.\"	$Id: quadmouse.4,v 1.2 1996/10/08 01:20:44 michaels Exp $
 .\"
 .Dd July 29, 1995
 .Dt LMS 4 arm32
-.Os NetBSD 1.0a
+.Os
 .Sh NAME
 .Nm quadmouse
 .Nd
diff --git a/share/man/man4/man4.arm32/wd.4 b/share/man/man4/man4.arm32/wd.4
index 8f2c047cec7..df2ae30c3c2 100644
--- a/share/man/man4/man4.arm32/wd.4
+++ b/share/man/man4/man4.arm32/wd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wd.4,v 1.1 1996/04/22 01:28:04 deraadt Exp $
+.\"	$OpenBSD: wd.4,v 1.2 1996/10/08 01:20:44 michaels Exp $
 .\"
 .\" Copyright (c) 1995 Mark Brinicombe
 .\" Based on man4.i386/wd.4 by James A. Jegers
@@ -25,7 +25,7 @@
 .\"
 .Dd July 29th, 1995 
 .Dt WD 4 arm32
-.Os NetBSD 
+.Os
 .Sh NAME
 .Nm wd 
 .Nd WD100x compatible hard disk driver
diff --git a/share/man/man4/man4.i386/gus.4 b/share/man/man4/man4.i386/gus.4
index 24d0de89b79..ec065352192 100644
--- a/share/man/man4/man4.i386/gus.4
+++ b/share/man/man4/man4.i386/gus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gus.4,v 1.4 1996/08/08 17:11:23 deraadt Exp $
+.\"	$OpenBSD: gus.4,v 1.5 1996/10/08 01:20:45 michaels Exp $
 .\"	$NetBSD: gus.4,v 1.2 1996/02/27 22:39:39 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/share/man/man4/man4.mvme68k/console.4 b/share/man/man4/man4.mvme68k/console.4
index d5aad19d810..1934a241c47 100644
--- a/share/man/man4/man4.mvme68k/console.4
+++ b/share/man/man4/man4.mvme68k/console.4
@@ -33,11 +33,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cons.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: console.4,v 1.1 1995/11/06 21:30:03 deraadt Exp $
+.\"	$Id: console.4,v 1.2 1996/10/08 01:20:46 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt CONSOLE 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm console
 .Nd
diff --git a/share/man/man4/man4.mvme68k/intro.4 b/share/man/man4/man4.mvme68k/intro.4
index 4105f0cd876..3813b045295 100644
--- a/share/man/man4/man4.mvme68k/intro.4
+++ b/share/man/man4/man4.mvme68k/intro.4
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: intro.4,v 1.1 1995/11/06 21:30:04 deraadt Exp $
+.\"	$Id: intro.4,v 1.2 1996/10/08 01:20:47 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt INTRO 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm intro
 .Nd introduction to special files and hardware support
diff --git a/share/man/man4/man4.mvme68k/le.4 b/share/man/man4/man4.mvme68k/le.4
index 89261b263c3..52b2ebfbbbb 100644
--- a/share/man/man4/man4.mvme68k/le.4
+++ b/share/man/man4/man4.mvme68k/le.4
@@ -35,11 +35,11 @@
 .\"
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
-.\"	$Id: le.4,v 1.1 1995/11/06 21:30:05 deraadt Exp $
+.\"	$Id: le.4,v 1.2 1996/10/08 01:20:47 michaels Exp $
 .\"
 .Dd August 30, 1994
 .Dt LE 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm le
 .Nd Ethernet driver for AMD7990(LANCE)-based boards 
diff --git a/share/man/man4/man4.mvme68k/mem.4 b/share/man/man4/man4.mvme68k/mem.4
index a094691d012..af1aafd3292 100644
--- a/share/man/man4/man4.mvme68k/mem.4
+++ b/share/man/man4/man4.mvme68k/mem.4
@@ -34,11 +34,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
-.\"	$Id: mem.4,v 1.1 1995/11/06 21:30:06 deraadt Exp $
+.\"	$Id: mem.4,v 1.2 1996/10/08 01:20:48 michaels Exp $
 .\"
 .Dd June 5, 1993
 .Dt MEM 4 amiga
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm mem ,
 .Nm kmem
diff --git a/share/man/man4/man4.pc532/lpt.4 b/share/man/man4/man4.pc532/lpt.4
index edccc6731b5..cbec8220877 100644
--- a/share/man/man4/man4.pc532/lpt.4
+++ b/share/man/man4/man4.pc532/lpt.4
@@ -28,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: lpt.4,v 1.2 1995/12/14 05:41:45 deraadt Exp $
+.\"	$Id: lpt.4,v 1.3 1996/10/08 01:20:48 michaels Exp $
 .\"
 .Dd December 1, 1994
 .Dt LPT 4 pc532
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm lpt
 .Nd Parallel port driver
diff --git a/share/man/man4/man4.pc532/plip.4 b/share/man/man4/man4.pc532/plip.4
index 0c29d9e1e18..47e60992dc7 100644
--- a/share/man/man4/man4.pc532/plip.4
+++ b/share/man/man4/man4.pc532/plip.4
@@ -31,7 +31,7 @@
 .\"
 .Dd December 1, 1994
 .Dt PLIP 4 pc532
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm plip
 .Nd "Option for the lpt driver to allow IP over centronics ports"
diff --git a/share/man/man4/man4.sun3/mem.4 b/share/man/man4/man4.sun3/mem.4
index 9cd33a8a57c..a024472c703 100644
--- a/share/man/man4/man4.sun3/mem.4
+++ b/share/man/man4/man4.sun3/mem.4
@@ -38,7 +38,7 @@
 .\"
 .Dd June 5, 1993
 .Dt MEM 4 sun3
-.Os NetBSD 1.0
+.Os
 .Sh NAME
 .Nm mem ,
 .Nm kmem
diff --git a/share/man/man4/man4.vax/mtio.4 b/share/man/man4/man4.vax/mtio.4
index 6eabb3c6eb2..34dbbc737fb 100644
--- a/share/man/man4/man4.vax/mtio.4
+++ b/share/man/man4/man4.vax/mtio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtio.4,v 1.3 1996/03/29 10:17:16 niklas Exp $
+.\"	$OpenBSD: mtio.4,v 1.4 1996/10/08 01:20:51 michaels Exp $
 .\"	$NetBSD: mtio.4,v 1.4 1996/03/03 17:13:54 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
@@ -40,7 +40,7 @@
 .Sh NAME
 .Nm mtio
 .Nd
-.Tn NetBSD
+.Tn OpenBSD
 magtape interface
 .Sh DESCRIPTION
 Each tape subsystem has a couple of special devices associated with it.
diff --git a/share/man/man4/man4.vax/tmscp.4 b/share/man/man4/man4.vax/tmscp.4
index a72229c4216..66d51cb3815 100644
--- a/share/man/man4/man4.vax/tmscp.4
+++ b/share/man/man4/man4.vax/tmscp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmscp.4,v 1.3 1996/03/29 10:17:27 niklas Exp $
+.\"	$OpenBSD: tmscp.4,v 1.4 1996/10/08 01:20:51 michaels Exp $
 .\"	$NetBSD: tmscp.4,v 1.4 1996/03/03 17:14:06 thorpej Exp $
 .\"
 .\" Copyright (c) 1986, 1991 Regents of the University of California.
@@ -36,7 +36,7 @@
 .\"
 .Dd January 7, 1996
 .Dt TMSCP 4 vax
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm tmscp
 .Nd
diff --git a/share/man/man4/man4.vax/ts.4 b/share/man/man4/man4.vax/ts.4
index c1f599069d2..3ef512e04da 100644
--- a/share/man/man4/man4.vax/ts.4
+++ b/share/man/man4/man4.vax/ts.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ts.4,v 1.3 1996/03/29 10:17:29 niklas Exp $
+.\"	$OpenBSD: ts.4,v 1.4 1996/10/08 01:20:52 michaels Exp $
 .\"	$NetBSD: ts.4,v 1.4 1996/03/03 17:14:08 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -36,7 +36,7 @@
 .\"
 .Dd January 7, 1996
 .Dt TS 4 vax
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm ts
 .Nd
diff --git a/share/man/man4/strip.4 b/share/man/man4/strip.4
index b4b267ceb45..60a0bd76549 100644
--- a/share/man/man4/strip.4
+++ b/share/man/man4/strip.4
@@ -12,7 +12,7 @@
 .\" express or implied warranty.
 .Dd March 10, 1996
 .Dt STRIP 4
-.Os NetBSD 1.1
+.Os
 .Sh NAME
 .Nm strip
 .\" Why doesn't this work right?  mdoc(7) nor mdoc.samples(7) lists
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 84df0977c7a..c4ed67fc332 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: at.1,v 1.2 1996/06/26 05:31:26 deraadt Exp $
+.\"	$OpenBSD: at.1,v 1.3 1996/10/08 01:20:52 michaels Exp $
 .\"	$NetBSD: at.1,v 1.6 1995/03/25 18:13:29 glass Exp $
 .\"
 .\"
@@ -33,7 +33,7 @@
 .\"
 .Dd December 5, 1993
 .Dt "AT" 1
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm at, batch, atq, atrm
 .Nd queue, examine, or delete jobs for later execution
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index e36173cfd75..6faa7d20b91 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipcs.1,v 1.3 1996/07/06 20:47:44 ccappuc Exp $
+.\"	$OpenBSD: ipcs.1,v 1.4 1996/10/08 01:20:53 michaels Exp $
 .\"	$NetBSD: ipcs.1,v 1.4 1995/04/15 02:31:16 cgd Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert
@@ -31,7 +31,7 @@
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
-.Os NetBSD 0.9c
+.Os
 .Sh NAME
 .Nm ipcs
 .Nd report System V interprocess communication facilities status
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index aa1682c8787..5e67948e3dc 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modstat.8,v 1.2 1996/06/26 05:37:15 deraadt Exp $
+.\"	$OpenBSD: modstat.8,v 1.3 1996/10/08 01:20:54 michaels Exp $
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\"
 .Dd June 7, 1993
 .Dt MODSTAT 8
-.Os NetBSD 0.8a
+.Os
 .Sh NAME
 .Nm modstat
 .Nd display status of loaded kernel modules
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index 3675c774f98..d5a902b2e2e 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: skey.1,v 1.5 1996/09/30 18:49:52 millert Exp $
+.\" $OpenBSD: skey.1,v 1.6 1996/10/08 01:20:55 michaels Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
 .Dd 28 October 1993
 .Dt SKEY 1
-.Os NetBSD 4
+.Os
 .Sh NAME
 .Nm skey, otp-md4, otp-md5, otp-sha1
 .Nd Respond to a OTP challenge.
diff --git a/usr.bin/skey/skeyaudit.1 b/usr.bin/skey/skeyaudit.1
index 99b7dbf1f6d..99dc13cd121 100644
--- a/usr.bin/skey/skeyaudit.1
+++ b/usr.bin/skey/skeyaudit.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: skeyaudit.1,v 1.2 1996/06/26 05:39:20 deraadt Exp $
+.\" $OpenBSD: skeyaudit.1,v 1.3 1996/10/08 01:20:55 michaels Exp $
 .\"
 .\"
 .Dd 9 June 1994
 .Dt SKEYAUDIT 1
-.Os NetBSD 4
+.Os
 .Sh NAME
 .Nm skeyaudit
 .Nd warn users if their S/Key will soon expire
diff --git a/usr.bin/skey/skeyinfo.1 b/usr.bin/skey/skeyinfo.1
index 86523eaaa61..8cc6630c2c5 100644
--- a/usr.bin/skey/skeyinfo.1
+++ b/usr.bin/skey/skeyinfo.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: skeyinfo.1,v 1.3 1996/09/30 18:49:53 millert Exp $
+.\" $OpenBSD: skeyinfo.1,v 1.4 1996/10/08 01:20:56 michaels Exp $
 .\"
 .\"
 .Dd 9 June 1994
 .Dt SKEYINFO 1
-.Os NetBSD 4
+.Os
 .Sh NAME
 .Nm skeyinfo
 .Nd obtain the next S/Key challenge for a user
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 396b74d206c..6a5eb6cf8d8 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: skeyinit.1,v 1.7 1996/09/30 18:49:54 millert Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.8 1996/10/08 01:20:57 michaels Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
 .Dd 28 October 1993
 .Dt SKEYINIT 1
-.Os NetBSD 4
+.Os
 .Sh NAME
 .Nm skeyinit
 .Nd change password or add user to S/Key authentication system.
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 0efa6707d70..e36d809fb25 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lint.1,v 1.3 1996/06/26 05:44:30 deraadt Exp $
+.\"	$OpenBSD: lint.1,v 1.4 1996/10/08 01:20:58 michaels Exp $
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -32,7 +32,7 @@
 .\"
 .Dd August 28, 1994
 .Dt LINT 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm lint
 .Nd a C program verifier.
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 0767cad10f1..4395c62ff4c 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -28,11 +28,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ac.8,v 1.1 1995/10/18 08:47:09 deraadt Exp $
+.\"	$Id: ac.8,v 1.2 1996/10/08 01:21:00 michaels Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm ac
 .Nd connect time accounting
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 33be988f856..47702ded596 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iostat.8,v 1.5 1996/09/29 17:36:01 deraadt Exp $
+.\"	$OpenBSD: iostat.8,v 1.6 1996/10/08 01:21:01 michaels Exp $
 .\"	$NetBSD: iostat.8,v 1.9 1996/05/10 23:20:28 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -36,7 +36,7 @@
 .\"
 .Dd Jan 18, 1996
 .Dt IOSTAT 8
-.Os NetBSD 1.1
+.Os
 .Sh NAME
 .Nm iostat
 .Nd report
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 3715efdf0ad..5ae3b99c1fb 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.1 1996/06/04 07:56:06 niklas Exp $	
+.\"	$OpenBSD: pkg_create.1,v 1.2 1996/10/08 01:21:01 michaels Exp $	
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -25,7 +25,7 @@
 .\"
 .Dd April 21, 1995
 .Dt pkg_create 1
-.Os FreeBSD 2.0
+.Os
 .Sh NAME
 .Nm pkg_create
 .Nd a utility for creating software package distributions.
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 3583f114769..2009bbf6714 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.1 1996/06/04 07:56:08 niklas Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.2 1996/10/08 01:21:02 michaels Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -19,7 +19,7 @@
 .\"
 .Dd November 25, 1994
 .Dt pkg_delete 1
-.Os FreeBSD 2.0
+.Os
 .Sh NAME
 .Nm pkg_delete
 .Nd a utility for deleting previously installed software package distributions.
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 62c619db526..4da127b855b 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_info.1,v 1.1 1996/06/04 07:56:10 niklas Exp $
+.\"	$OpenBSD: pkg_info.1,v 1.2 1996/10/08 01:21:03 michaels Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -19,7 +19,7 @@
 .\"
 .Dd November 25, 1994
 .Dt pkg_info 1
-.Os FreeBSD 2.0
+.Os
 .Sh NAME
 .Nm pkg_info
 .Nd a utility for displaying information on software packages.
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 0e7e9043973..e89171378ff 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.7 1996/10/08 01:21:04 michaels Exp $
+.\" $OpenBSD: pppd.8,v 1.6 1996/10/08 01:20:59 michaels Exp $
 .\" manual page [] for pppd 2.0
 .\" SH section heading
 .\" SS subsection heading
diff --git a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8 b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
index 0b6b6f67221..a9d26866c46 100644
--- a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
+++ b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
@@ -1,8 +1,8 @@
-.\" $Id: rpc.bootparamd.8,v 1.2 1996/09/30 12:57:05 deraadt Exp $
+.\" $Id: rpc.bootparamd.8,v 1.3 1996/10/08 01:21:05 michaels Exp $
 .\" @(#)bootparamd.8
 .Dd Jan 8, 1994
 .Dt BOOTPARAMD 8
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm bootparamd ,
 .Nm rpc.bootparamd
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 63362244271..762945432e1 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -27,11 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: sa.8,v 1.1 1995/10/18 08:48:07 deraadt Exp $
+.\"	$Id: sa.8,v 1.2 1996/10/08 01:21:06 michaels Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
-.Os NetBSD 0.9a
+.Os
 .Sh NAME
 .Nm sa
 .Nd print system accounting statistics
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index 7e9a4a1705e..6388f504122 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -23,7 +23,7 @@
 .\"
 .Dd July 10, 1995
 .Dt SPRAY 8
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm spray
 .Nd send many packets to host