diff --git a/lib/libc/hash/sha1.3 b/lib/libc/hash/sha1.3
index aa2be01f6e41..9f39f7c9288a 100644
--- a/lib/libc/hash/sha1.3
+++ b/lib/libc/hash/sha1.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sha1.3,v 1.3 1999/02/28 00:00:03 ross Exp $
+.\"	$NetBSD: sha1.3,v 1.4 2000/09/21 10:43:49 ad Exp $
 .\"	$OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -209,4 +209,5 @@ helper functions are derived from code written by Poul-Henning Kamp.
 .%O FIPS PUB 180-1
 .Re
 .Sh HISTORY
-The SHA-1 functions appeared in OpenBSD 2.0.
+The SHA-1 functions appeared in
+.Ox 2.0 .
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index bf30dc6f72e3..3137058d49b8 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getifaddrs.3,v 1.2 2000/02/23 15:29:18 itojun Exp $
+.\"	$NetBSD: getifaddrs.3,v 1.3 2000/09/21 10:43:49 ad Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
 .\" Copyright (c) 1995, 1999
@@ -159,4 +159,5 @@ be included before
 .Sh HISTORY
 The
 .Nm
-implementation first appeared in BSDI BSD/OS.
+implementation first appeared in
+.Bsx .
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index 5d1cefb40a2f..f8b82328060c 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: if_indextoname.3,v 1.5 2000/04/24 10:24:47 itojun Exp $
+.\"	$NetBSD: if_indextoname.3,v 1.6 2000/09/21 10:43:49 ad Exp $
 .\"	$KAME: if_indextoname.3,v 1.8 2000/04/24 10:12:36 itojun Exp $
 .\"	BSDI	Id: if_indextoname.3,v 2.2 2000/04/17 22:38:05 dab Exp
 .\"
@@ -122,4 +122,5 @@ and
 .Fn if_freenameindex
 functions conform to RFC 2553.
 .Sh HISTORY
-The implementation first appeared in BSDI BSD/OS.
+The implementation first appeared in
+.Bsx .
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 4000c9f93fee..b936aa19f53b 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: login_cap.3,v 1.4 2000/03/08 00:02:54 mjl Exp $
+.\" $NetBSD: login_cap.3,v 1.5 2000/09/21 10:43:49 ad Exp $
 .\"
 .\" Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -224,7 +224,8 @@ Sets all of the above.
 .Sh HISTORY
 The
 .Nm
-family of functions are largely based on the BSD/OS implementation of same,
-and appeared in
+family of functions are largely based on the
+.Bsx
+implementation of same, and appeared in
 .Nx 1.5
 by kind permission.
diff --git a/lib/libutil/secure_path.3 b/lib/libutil/secure_path.3
index 6f9823d6d161..740fa2aa4bb6 100644
--- a/lib/libutil/secure_path.3
+++ b/lib/libutil/secure_path.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: secure_path.3,v 1.3 2000/09/19 15:03:20 ad Exp $
+.\"	$NetBSD: secure_path.3,v 1.4 2000/09/21 10:43:49 ad Exp $
 .\"
 .\" Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -58,7 +58,8 @@ directory), owned by the super-user, and writable only by the super-user.
 .Sh HISTORY
 The 
 .Nm 
-function is based on the BSD/OS implementation of same
-and appeared in
+function is based on the
+.Bsx
+implementation of same, and appeared in
 .Nx 1.5
 by kind permission.
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 85244e031c1f..1f50e79fa4c2 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: umass.4,v 1.7 2000/08/12 14:54:18 augustss Exp $
+.\" $NetBSD: umass.4,v 1.8 2000/09/21 10:43:50 ad Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -68,8 +68,9 @@ Devices known to work with this driver include:
 .Sh HISTORY
 The
 .Nm 
-driver is a port of the FreeBSD driver.
-The
+driver is a port of the
+.Fx
+driver.  The
 .Nm
 driver
 appeared in
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index bf1a56290dc0..a3f80ec6be9e 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: urio.4,v 1.1 2000/04/14 14:48:29 augustss Exp $
+.\" $NetBSD: urio.4,v 1.2 2000/09/21 10:43:50 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -72,4 +72,6 @@ The
 driver
 appeared in
 .Nx 1.5 .
-This driver is based on a FreeBSD Rio driver written by Iwasa Kazmi.
+This driver is based on a
+.Fx
+Rio driver written by Iwasa Kazmi.
diff --git a/share/man/man4/wscons.4 b/share/man/man4/wscons.4
index db1527a0d219..b892f7cfa02d 100644
--- a/share/man/man4/wscons.4
+++ b/share/man/man4/wscons.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: wscons.4,v 1.12 2000/05/02 19:02:28 drochner Exp $
+.\" $NetBSD: wscons.4,v 1.13 2000/09/21 10:43:50 ad Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -150,7 +150,7 @@ In addition to the plain
 functions are supported:
 .Bl -bullet
 .It
-ANSI colors
+ANSI colors.
 .It
 Some
 .Tn VT220
@@ -198,9 +198,12 @@ Emulates enough of the
 .Dq pcvt
 driver to make X servers work.
 .It Cd WSDISPLAY_COMPAT_SYSCONS
-Emulates enough of the i386 FreeBSD
+Emulates enough of the
+.Fx
 .Dq syscons
-driver to make X servers work. Useful with FreeBSD binary emulation.
+driver to make X servers work. Useful with
+.Fx
+binary emulation.
 .El
 .Pp
 Linux/i386 X servers do usually run if the first two options are
diff --git a/share/man/man9/uvm.9 b/share/man/man9/uvm.9
index b417437da3a9..13473efbd698 100644
--- a/share/man/man9/uvm.9
+++ b/share/man/man9/uvm.9
@@ -1,4 +1,4 @@
-.\"	$NetBSD: uvm.9,v 1.14 2000/06/29 06:08:44 mrg Exp $
+.\"	$NetBSD: uvm.9,v 1.15 2000/09/21 10:43:50 ad Exp $
 .\"
 .\" Copyright (c) 1998 Matthew R. Green
 .\" All rights reserved.
@@ -900,13 +900,16 @@ manual page is not yet written.
 UVM is a new VM system developed at Washington University in St. Louis
 (Missouri).  UVM's roots lie partly in the Mach-based
 .Bx 4.4
-VM system, the FreeBSD VM system, and the SunOS4 VM system.  UVM's basic
-structure is based on the
+VM system, the
+.Fx
+VM system, and the SunOS4 VM system.  UVM's basic structure is based on the
 .Bx 4.4
 VM system.  UVM's new anonymous memory system is based on the
-anonymous memory system found in SunOS4 VM (as described in papers by
+anonymous memory system found in the SunOS4 VM (as described in papers by
 published Sun Microsystems, Inc.).  UVM also includes a number of feature
-new to BSD including page loanout, map entry passing, simplified
+new to
+.Bx
+including page loanout, map entry passing, simplified
 copy-on-write, and clustered anonymous memory pageout.  UVM is also
 further documented in a August 1998 dissertation by Charles D. Cranor.
 .Pp
@@ -917,7 +920,8 @@ Charles D. Cranor <chuck@ccrc.wustl.edu> designed and implemented UVM.
 .Pp
 Matthew Green <mrg@eterna.com.au> wrote the swap-space management code
 and handled the logistical issues involed with merging UVM into the
-NetBSD source tree.
+.Nx
+source tree.
 .Pp
 Chuck Silvers <chuq@chuq.com> implemented the aobj pager, thus allowing
 UVM to support System V shared memory and process swapping.