use Bx macro for BSD versions

72 files changed, 216 insertions, 132 deletions

diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 7271f237f34..57a299cf189 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -148,4 +148,5 @@ default output file.
 .Sh HISTORY
 The
 .Nm strfile
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 3af74c4c41c..51c2954407c 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: confstr.3,v 1.3 1998/04/28 07:36:29 deraadt Exp $
+.\"	$OpenBSD: confstr.3,v 1.4 1998/06/15 17:54:53 mickey Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -121,7 +121,8 @@ argument is invalid.
 .Sh HISTORY
 The
 .Nm confstr
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh STANDARDS
 The
 .Nm confstr
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index 13ae631a406..f1cef5eb76f 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getgrouplist.3,v 1.3 1996/08/19 08:23:30 tholo Exp $
+.\"	$OpenBSD: getgrouplist.3,v 1.4 1998/06/15 17:54:54 mickey Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -79,7 +79,8 @@ group membership list
 .Sh HISTORY
 The
 .Fn getgrouplist
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn getgrouplist
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index 762d00194e4..1028ddbfca1 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getmntinfo.3,v 1.2 1996/08/19 08:23:43 tholo Exp $
+.\"	$OpenBSD: getmntinfo.3,v 1.3 1998/06/15 17:54:55 mickey Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -92,7 +92,8 @@ or
 .Sh HISTORY
 The
 .Fn getmntinfo
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn getmntinfo
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 2c7b0865662..3f2e7618a7a 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwcache.3,v 1.3 1996/08/19 08:25:26 tholo Exp $
+.\"	$OpenBSD: pwcache.3,v 1.4 1998/06/15 17:54:57 mickey Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -86,4 +86,5 @@ The
 .Fn user_from_uid
 and
 .Fn group_from_gid
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index 7c1babb5ec2..0fd7cb1b48c 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setmode.3,v 1.3 1996/08/19 08:25:54 tholo Exp $
+.\"	$OpenBSD: setmode.3,v 1.4 1998/06/15 17:54:58 mickey Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -101,4 +101,5 @@ The
 .Fn getmode
 and
 .Fn setmode
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 1bb9606077d..118e0290b39 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysconf.3,v 1.4 1998/06/02 06:10:24 deraadt Exp $
+.\"	$OpenBSD: sysconf.3,v 1.5 1998/06/15 17:54:59 mickey Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -185,4 +185,5 @@ function conforms to
 .Sh HISTORY
 The
 .Nm sysconf
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index cb74ecc6fcf..a088a1ea59a 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.10 1998/06/11 06:01:04 beck Exp $
+.\"	$OpenBSD: sysctl.3,v 1.11 1998/06/15 17:55:00 mickey Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -719,4 +719,5 @@ definitions for fourth level UDP identifiers
 .Sh HISTORY
 The
 .Nm sysctl
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index c1a74bd36a3..1bb1818a754 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uname.3,v 1.3 1997/05/30 07:48:28 deraadt Exp $
+.\"	$OpenBSD: uname.3,v 1.4 1998/06/15 17:55:01 mickey Exp $
 .\"
 .\" Copyright (c) 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -89,4 +89,5 @@ function conforms to
 .Sh HISTORY
 The
 .Nm uname
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index 5931b7b5af5..32abbbacc93 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unvis.3,v 1.3 1996/08/19 08:27:14 tholo Exp $
+.\"	$OpenBSD: unvis.3,v 1.4 1998/06/15 17:55:02 mickey Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -160,5 +160,5 @@ if (unvis(&out, (char)0, &state, UNVIS_END) == UNVIS_VALID)
 .Sh HISTORY
 The
 .Nm unvis
-function
-first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 8a4a68a2b0c..23207f8e076 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.3,v 1.3 1996/08/19 08:27:34 tholo Exp $
+.\"	$OpenBSD: vis.3,v 1.4 1998/06/15 17:55:04 mickey Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -259,5 +259,6 @@ ambiguous and non-invertible.
 .Xr unvis 1 ,
 .Xr unvis 3
 .Sh HISTORY
-These functions first appeared in 4.4BSD.
+These functions first appeared in
+.Bx 4.4 .
 
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 8e3f48d6aa4..4e05c3d5b3b 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.4 1997/07/29 02:29:08 flipk Exp $
+.\"	$OpenBSD: regex.3,v 1.5 1998/06/15 17:55:05 mickey Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -513,7 +513,9 @@ invalid argument, e.g. negative-length string
 .El
 .Sh HISTORY
 Originally written by Henry Spencer.
-Altered for inclusion in the 4.4BSD distribution.
+Altered for inclusion in the
+.Bx 4.4
+distribution.
 .Sh BUGS
 This is an alpha release with known defects.
 Please report problems.
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index 226cc4b9ef9..fcbcabb9c89 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgetln.3,v 1.2 1996/08/19 08:32:28 tholo Exp $
+.\"	$OpenBSD: fgetln.3,v 1.3 1998/06/15 17:54:49 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -120,4 +120,5 @@ or
 .Sh HISTORY
 The
 .Fn fgetln
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index 47253d14467..4c4278c92db 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: funopen.3,v 1.5 1996/09/20 03:13:38 tholo Exp $
+.\"	$OpenBSD: funopen.3,v 1.6 1998/06/15 17:54:50 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -161,7 +161,8 @@ specified for the routine
 .Sh HISTORY
 The
 .Fn funopen
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn funopen
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 148fb1f6147..bae119cce12 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.8 1998/03/07 21:53:30 millert Exp $
+.\"	$OpenBSD: printf.3,v 1.9 1998/06/15 17:54:48 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -636,7 +636,8 @@ The functions
 .Fn snprintf
 and
 .Fn vsnprintf
-are new to this release.
+first appeared in
+.Bx 4.4 .
 .Pp
 The functions
 .Fn asprintf
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index 06e089203f1..8acc91bdd1b 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getsubopt.3,v 1.1 1997/08/20 04:02:17 millert Exp $
+.\" $OpenBSD: getsubopt.3,v 1.2 1998/06/15 17:55:07 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -144,4 +144,5 @@ while ((ch = getopt(argc, argv, "ab:")) != \-1) {
 .Sh HISTORY
 The
 .Fn getsubopt
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index 9b2ee2e35b8..8b0ea89a0ff 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: radixsort.3,v 1.3 1997/01/19 19:47:01 millert Exp $
+.\"	$OpenBSD: radixsort.3,v 1.4 1998/06/15 17:55:08 mickey Exp $
 .\"
 .Dd January 27, 1994
 .Dt RADIXSORT 3
@@ -157,4 +157,5 @@ for any of the errors specified for the library routine
 .Sh HISTORY
 The
 .Fn radixsort
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 2fabd2f5eab..c2e15b1405d 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: memccpy.3,v 1.3 1997/08/20 04:09:39 millert Exp $
+.\" $OpenBSD: memccpy.3,v 1.4 1998/06/15 17:55:09 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -71,4 +71,5 @@ bytes are copied, and a NULL pointer is returned.
 .Sh HISTORY
 The
 .Fn memccpy
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index e098ff4e413..52a13055ee5 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strcasecmp.3,v 1.3 1997/08/20 04:13:56 millert Exp $
+.\" $OpenBSD: strcasecmp.3,v 1.4 1998/06/15 17:55:11 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -85,4 +85,5 @@ The
 .Fn strcasecmp
 and
 .Fn strncasecmp
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index 04ec042d00c..77bbb5a21b7 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strdup.3,v 1.4 1997/08/20 04:18:51 millert Exp $
+.\" $OpenBSD: strdup.3,v 1.5 1998/06/15 17:55:12 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -64,4 +64,5 @@ If insufficient memory is available, NULL is returned.
 .Sh HISTORY
 The
 .Fn strdup
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 4dbbdd09573..3db953704d4 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strmode.3,v 1.5 1998/05/04 02:00:05 deraadt Exp $
+.\" $OpenBSD: strmode.3,v 1.6 1998/06/15 17:55:13 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -148,4 +148,5 @@ always returns 0.
 .Sh HISTORY
 The
 .Fn strmode
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 471e693ecc9..5af262a074e 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strsep.3,v 1.3 1997/08/20 04:28:13 millert Exp $
+.\" $OpenBSD: strsep.3,v 1.4 1998/06/15 17:55:14 mickey Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -106,4 +106,5 @@ two adjacent delimiter characters, or to be used for more than a single
 string at a time.
 The
 .Fn strsep
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index d370c4f9093..c509a824680 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -162,4 +162,5 @@ The
 .Fn chflags
 and
 .Nm fchflags
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index e6cc24a50ab..d7ecb5de859 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -151,4 +151,5 @@ error occurred while reading from or writing to the file system.
 .Sh HISTORY
 The
 .Fn getdirentries
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index ff12795ad19..f2d84e3c124 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -95,4 +95,5 @@ error occurred while reading from or writing to the file system.
 The
 .Fn getfh
 function
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 67581d9f660..600d7564b94 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -133,4 +133,5 @@ error occurred while reading from or writing to the file system.
 .Sh HISTORY
 The
 .Fn getfsstat
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index ec55ef20ce2..c4508027171 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -125,4 +125,5 @@ Portable programs should probably still make this check.
 .Sh HISTORY
 The
 .Fn getlogin
-function first appeared in 4.2BSD.
+function first appeared in
+.Bx 4.2 .
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index fe8a61d1eb5..1a685513dc0 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpgrp.2,v 1.3 1998/02/03 23:35:04 deraadt Exp $
+.\"	$OpenBSD: getpgrp.2,v 1.4 1998/06/15 17:55:21 mickey Exp $
 .\"	$NetBSD: getpgrp.2,v 1.8 1995/02/27 12:33:09 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -101,7 +101,8 @@ From the
 .St -p1003.1-88
 Rationale:
 .sp
-4.3BSD provides a
+.Bx 4.3
+provides a
 .Fn getpgrp
 function that returns the process group ID for a specified process.
 Although this function is used to support job control, all known
@@ -109,6 +110,7 @@ job-control shells always specify the calling process with this
 function.
 Thus, the simpler System V
 .Fn getpgrp
-suffices, and the added complexity of the 4.3BSD
+suffices, and the added complexity of the
+.Bx 4.3
 .Fn getpgrp
 has been omitted from POSIX.1.
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index ae72f991756..2be1c0b7c81 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -75,4 +75,5 @@ is set to indicate the error.
 .Sh HISTORY
 The
 .Nm madvise
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 9aaa7083993..d94c320534c 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -70,4 +70,5 @@ is set to indicate the error.
 .Sh HISTORY
 The
 .Fn mincore
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index 2ba0af294d5..4ba32322ff2 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -162,4 +162,5 @@ The
 .Fn mlock
 and
 .Fn munlock
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 2c0662a75a5..a81b6d9264f 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -66,4 +66,5 @@ is set to indicate the error.
 .Sh HISTORY
 The
 .Fn mprotect
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 8f038a8e32c..dc4872102f1 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -123,6 +123,7 @@ flag is specified.
 .Sh HISTORY
 The
 .Fn msync
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 It was modified to conform to
 .St -p1003.1b-93
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 67e34c62fd1..76bcacb9475 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -79,4 +79,5 @@ valid address space.
 .Sh HISTORY
 The
 .Fn munmap
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index e9dc80a0b9a..17497251e16 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -231,7 +231,8 @@ The caller is not the super-user.
 .Sh HISTORY
 The
 .Nm nfssvc
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Nm nfssvc
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index a947bd1e341..fe0a338cb43 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -162,4 +162,5 @@ The
 .Nm pathconf
 and
 .Nm fpathconf
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 7cc8fd5df5c..533ea663b92 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -147,4 +147,5 @@ error occurred while reading from or writing to the file system.
 .Sh HISTORY
 The
 .Fn statfs
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libcurses/curs_print.3 b/lib/libcurses/curs_print.3
index 7b470bcd449..1b50aead4ec 100644
--- a/lib/libcurses/curs_print.3
+++ b/lib/libcurses/curs_print.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: curs_print.3,v 1.4 1997/12/14 23:15:41 millert Exp $
+.\" $OpenBSD: curs_print.3,v 1.5 1998/06/15 17:55:33 mickey Exp $
 .\" Id: curs_print.3x,v 1.2 1997/12/06 22:07:19 tom Exp $
 .TH curs_print 3 ""
 .SH NAME
@@ -33,7 +33,9 @@ When \fBmcprint\fR succeeds, it returns the number of characters actually
 sent to the printer.
 .SH PORTABILITY
 The \fBmcprint\fR call was designed for \fBcurses\fR(3), and is not found
-in SVr4 curses, 4.4BSD curses, or any other previous version of curses.
+in SVr4 curses,
+.Bx 4.4
+curses, or any other previous version of curses.
 .SH BUGS
 Padding in the \fBmc5p\fR, \fBmc4\fR and \fBmc5\fR capabilities will not be
 interpreted.
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 0ad9d311af5..a22d4c0815d 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	$Id: gettytab.5,v 1.5 1998/06/10 17:30:11 deraadt Exp $
+.\"	$Id: gettytab.5,v 1.6 1998/06/15 17:55:34 mickey Exp $
 .\"
 .Dd April 19, 1994
 .Dt GETTYTAB 5
@@ -389,4 +389,5 @@ have been chosen.
 .Sh HISTORY
 The
 .Nm gettytab
-file format appeared in 4.2BSD.
+file format appeared in
+.Bx 4.2 .
diff --git a/libexec/lfs_cleanerd/lfs_cleanerd.8 b/libexec/lfs_cleanerd/lfs_cleanerd.8
index e59af71c680..dd03bfe9bcf 100644
--- a/libexec/lfs_cleanerd/lfs_cleanerd.8
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lfs_cleanerd.8,v 1.3 1997/05/30 07:48:40 deraadt Exp $
+.\"	$OpenBSD: lfs_cleanerd.8,v 1.4 1998/06/15 17:55:36 mickey Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -76,4 +76,5 @@ When cleaning the file system, read data in small chunks.
 .Sh HISTORY
 The
 .Nm lfs_cleanerd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/libexec/tcpd/tcpd/tcpd.8 b/libexec/tcpd/tcpd/tcpd.8
index 61401d516f5..3e143cd095b 100644
--- a/libexec/tcpd/tcpd/tcpd.8
+++ b/libexec/tcpd/tcpd/tcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpd.8,v 1.2 1997/06/24 02:12:24 downsj Exp $
+.\"	$OpenBSD: tcpd.8,v 1.3 1998/06/15 17:55:37 mickey Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -51,7 +51,9 @@ program can be set up to monitor incoming requests for
 .Xr comsat 8 ,
 and other services that have a one-to-one mapping onto executable files.
 .Pp
-.\" The program supports both 4.3BSD-style sockets and System V.4-style
+.\" The program supports both
+.\" .Bx 4.3 -style
+.\" sockets and System V.4-style
 .\" TLI.  Functionality may be limited when the protocol underneath TLI is
 .\" not an internet protocol.
 .\" .Pp
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index 687f08370e3..be5dedc4e66 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnetd.8,v 1.4 1996/04/23 03:03:50 deraadt Exp $
+.\"	$OpenBSD: telnetd.8,v 1.5 1998/06/15 17:55:39 mickey Exp $
 .\"	$NetBSD: telnetd.8,v 1.8 1996/03/20 04:25:55 tls Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -452,7 +452,8 @@ is willing to receive an 8 bit data stream.
 Requests that the client handle flow control
 characters remotely.
 .It "DO ECHO"
-This is not really supported, but is sent to identify a 4.2BSD
+This is not really supported, but is sent to identify a
+.Bx 4.2
 .Xr telnet 1
 client, which will improperly respond with
 .Dv WILL ECHO.
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 3ce1a4079a7..09f6837d211 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_cd9660.8,v 1.3 1997/04/19 20:07:24 flipk Exp $
+.\"	$OpenBSD: mount_cd9660.8,v 1.4 1998/06/15 17:55:40 mickey Exp $
 .\"	$NetBSD: mount_cd9660.8,v 1.3 1995/04/23 10:33:13 cgd Exp $
 .\"
 .\" Copyright (c) 1993, 1994
@@ -99,4 +99,5 @@ There is no ECMA support.
 .Sh HISTORY
 The
 .Nm mount_cd9660
-utility first appeared 4.4BSD.
+utility first appeared
+.Bx 4.4 .
diff --git a/sbin/mount_fdesc/mount_fdesc.8 b/sbin/mount_fdesc/mount_fdesc.8
index ba0b571cd38..8b267089b62 100644
--- a/sbin/mount_fdesc/mount_fdesc.8
+++ b/sbin/mount_fdesc/mount_fdesc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_fdesc.8,v 1.3 1996/06/23 14:31:18 deraadt Exp $
+.\"	$OpenBSD: mount_fdesc.8,v 1.4 1998/06/15 17:55:42 mickey Exp $
 .\"	$NetBSD: mount_fdesc.8,v 1.6 1995/12/17 18:50:19 ghudson Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -153,4 +153,5 @@ This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
 .Nm mount_fdesc
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/mount_kernfs/mount_kernfs.8 b/sbin/mount_kernfs/mount_kernfs.8
index 03e0513feda..8950506f90d 100644
--- a/sbin/mount_kernfs/mount_kernfs.8
+++ b/sbin/mount_kernfs/mount_kernfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_kernfs.8,v 1.3 1996/06/23 14:31:22 deraadt Exp $
+.\"	$OpenBSD: mount_kernfs.8,v 1.4 1998/06/15 17:55:43 mickey Exp $
 .\"	$NetBSD: mount_kernfs.8,v 1.6 1995/03/18 14:57:24 cgd Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -158,4 +158,5 @@ This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
 .Nm mount_kernfs
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/mount_lfs/mount_lfs.8 b/sbin/mount_lfs/mount_lfs.8
index 22e7153cb52..712ce694cf8 100644
--- a/sbin/mount_lfs/mount_lfs.8
+++ b/sbin/mount_lfs/mount_lfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_lfs.8,v 1.3 1997/05/30 07:48:47 deraadt Exp $
+.\"	$OpenBSD: mount_lfs.8,v 1.4 1998/06/15 17:55:44 mickey Exp $
 .\"	$NetBSD: mount_lfs.8,v 1.2 1995/03/18 14:57:30 cgd Exp $
 .\"
 .\" Copyright (c) 1993, 1994
@@ -125,4 +125,5 @@ to read data in small chunks when cleaning the file system.
 .Sh HISTORY
 The
 .Nm mount_lfs
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 39aeb903776..9d2cda0fb5d 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_nfs.8,v 1.6 1997/04/20 15:37:25 deraadt Exp $
+.\"	$OpenBSD: mount_nfs.8,v 1.7 1998/06/15 17:55:46 mickey Exp $
 .\"	$NetBSD: mount_nfs.8,v 1.3 1996/02/18 11:59:10 fvdl Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994, 1995
@@ -249,4 +249,6 @@ to have limited success.
 For clients mounting servers that are not on the same
 LAN cable or that tend to be overloaded,
 TCP transport is strongly recommended,
-but unfortunately this is restricted to mostly 4.4BSD servers.
+but unfortunately this is restricted to mostly
+.Bx 4.4
+servers.
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index e21aceb810c..d1fb5661233 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_null.8,v 1.3 1996/06/23 14:31:28 deraadt Exp $
+.\"	$OpenBSD: mount_null.8,v 1.4 1998/06/15 17:55:47 mickey Exp $
 .\"	$NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -210,4 +210,5 @@ UCLA Technical Report CSD-910056,
 .Sh HISTORY
 The
 .Nm mount_null
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/mount_procfs/mount_procfs.8 b/sbin/mount_procfs/mount_procfs.8
index b5b363e8c81..1b142bfe7b1 100644
--- a/sbin/mount_procfs/mount_procfs.8
+++ b/sbin/mount_procfs/mount_procfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_procfs.8,v 1.4 1997/11/04 19:19:18 kstailey Exp $
+.\"	$OpenBSD: mount_procfs.8,v 1.5 1998/06/15 17:55:49 mickey Exp $
 .\"	$NetBSD: mount_procfs.8,v 1.6 1995/03/18 14:58:10 cgd Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -236,4 +236,5 @@ requires that state be maintained.
 .Sh HISTORY
 The
 .Nm mount_procfs
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 6a03d4abf66..dccfe32fda2 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_umap.8,v 1.4 1997/05/30 07:48:48 deraadt Exp $
+.\"	$OpenBSD: mount_umap.8,v 1.5 1998/06/15 17:55:50 mickey Exp $
 .\"	$NetBSD: mount_umap.8,v 1.4 1996/03/05 02:36:42 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -132,4 +132,5 @@ sophisticated.
 .Sh HISTORY
 The
 .Nm mount_umap
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 04b500dfbcd..19fcf24c368 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mountd.8,v 1.7 1998/04/28 07:37:22 deraadt Exp $
+.\"	$OpenBSD: mountd.8,v 1.8 1998/06/15 17:55:52 mickey Exp $
 .\"	$NetBSD: mountd.8,v 1.11 1996/02/18 11:57:51 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -111,4 +111,5 @@ the pid of the currently running mountd
 .Sh HISTORY
 The
 .Nm mountd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index a2ce2d6fb5c..018adef4ce1 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newfs.8,v 1.6 1997/06/16 00:03:10 deraadt Exp $
+.\"	$OpenBSD: newfs.8,v 1.7 1998/06/15 17:55:53 mickey Exp $
 .\"	$NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -140,7 +140,9 @@ The following options define the general layout policies.
 Causes the file system parameters to be printed out
 without really creating the file system.
 .It Fl O
-Creates a 4.3BSD format filesystem.
+Creates a
+.Bx 4.3
+format filesystem.
 This options is primarily used to build root filesystems
 that can be understood by older boot ROMs.
 .It Fl a Ar maxcontig
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index c99ede58fa0..def8f7424c4 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: nfsd.8,v 1.3 1996/11/08 11:03:56 mickey Exp $
+.\"   $OpenBSD: nfsd.8,v 1.4 1998/06/15 17:55:55 mickey Exp $
 .\"   $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -115,4 +115,5 @@ utility exits 0 on success, and >0 if an error occurs.
 .Sh HISTORY
 The
 .Nm nfsd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 1ca9a490f50..ed88a982c1f 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nfsiod.8,v 1.3 1998/02/13 04:13:14 downsj Exp $
+.\"	$OpenBSD: nfsiod.8,v 1.4 1998/06/15 17:55:56 mickey Exp $
 .\"	$NetBSD: nfsiod.8,v 1.6 1995/03/18 14:59:04 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -74,4 +74,5 @@ utility exits 0 on success, and >0 if an error occurs.
 .Sh HISTORY
 The
 .Nm nfsiod
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 07146e69027..37e3a7edcb7 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: routed.8,v 1.11 1997/07/30 23:28:45 deraadt Exp $
+.\"	$OpenBSD: routed.8,v 1.12 1998/06/15 17:55:58 mickey Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,7 +56,9 @@ It uses Routing Information Protocol, RIPv1 (RFC\ 1058),
 RIPv2 (RFC\ 1723),
 and Internet Router Discovery Protocol (RFC 1256)
 to maintain the kernel routing table.
-The RIPv1 protocol is based on the reference 4.3BSD daemon.
+The RIPv1 protocol is based on the reference
+.Bx 4.3
+daemon.
 .Pp
 It listens on the
 .Xr udp 4
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 985c2a54cae..05cffafab58 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.18 1998/06/02 06:10:33 deraadt Exp $
+.\"	$OpenBSD: sysctl.8,v 1.19 1998/06/15 17:56:21 mickey Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -305,4 +305,5 @@ definitions for second level ddb identifiers
 .Xr sysctl 3
 .Sh HISTORY
 .Nm sysctl
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index 4257c54578d..bcc14883a74 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -178,4 +178,5 @@ make_lpr_available()
 .Sh HISTORY
 The
 .Nm bitstring
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 28b097ca20f..b089c00761f 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -477,4 +477,5 @@ while (head.cqh_first != (void *)&head)
 .Sh HISTORY
 The
 .Nm queue
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index a89b7a351b6..3e49418dabb 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.9 1998/03/16 23:28:09 gene Exp $
+.\"	$OpenBSD: options.4,v 1.10 1998/06/15 17:56:02 mickey Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt 
@@ -125,8 +125,9 @@ See
 Enable compatibility with a.out executables that lack a machine id.
 On the i386, this includes NetBSD 0.8's ZMAGIC format, 386BSD and BSDI's
 QMAGIC, NMAGIC, and OMAGIC a.out formats.  On the hp300 and other m68k
-architectures this permits
-certain old 4.3BSD binaries to work, though it's use is discouraged now.
+architectures this permits certain old
+.Bx 4.3
+binaries to work, though it's use is discouraged now.
 .It Cd option COMPAT_43
 Use of this option is discouraged. It enables compatibility with
 .Bx 4.3 .
@@ -559,11 +560,16 @@ require you to enable this, you're better off just disconnecting
 .Em them
 from the network.
 .Pp
-TCP bug compatibility with 4.2BSD.  In 4.2BSD, TCP sequence numbers
+TCP bug compatibility with
+.Bx 4.2 .
+In
+.Bx 4.2 ,
+TCP sequence numbers
 were 32-bit signed values.  Modern implementations of TCP use unsigned
 values.  This option clamps the initial sequence number to start in
-the range 2^31 rather than the full unsigned range of 2^32.  Also,
-under 4.2BSD, keepalive packets must contain at least one byte or else
+the range 2^31 rather than the full unsigned range of 2^32.  Also, under
+.Bx 4.2 ,
+keepalive packets must contain at least one byte or else
 the remote end would not respond.
 .It Cd option PFIL_HOOKS
 This option turns on the packet filter interface hooks.  See
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 40635486814..4d57ba99a07 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -238,7 +238,8 @@ User information should (and eventually will) be stored elsewhere.
 Placing YP exclusions in the file after any inclusions will have
 unexpected results.
 .Sh COMPATIBILITY
-The password file format has changed since 4.3BSD.
+The password file format has changed since
+.Bx 4.3 .
 The following awk script can be used to convert your old-style password
 file into a new style password file.
 The additional fields
diff --git a/share/man/man8/compat_ultrix.8 b/share/man/man8/compat_ultrix.8
index 589eab5f187..70c2806f7a3 100644
--- a/share/man/man8/compat_ultrix.8
+++ b/share/man/man8/compat_ultrix.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_ultrix.8,v 1.2 1998/01/02 08:51:30 deraadt Exp $
+.\"	$OpenBSD: compat_ultrix.8,v 1.3 1998/06/15 17:56:05 mickey Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
 .\" All rights reserved.
@@ -50,7 +50,9 @@ semantics that are difficult to emulate (e.g., Ultrix packetfilter) or
 buggy (e.g., Ultrix YP). 
 .Pp
 All Ultrix executables are static, so no shared libraries are required
-for Ultrix compatiblity. However, Ultrix is based on a 4.3BSD alpha
+for Ultrix compatiblity. However, Ultrix is based on a
+.Bx 4.3 
+alpha
 release.  Ultrix commands and libraries are often much older than
 their OpenBSD or even SunOS 4.x equivalents, and may require incompatible
 configuration files.
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index f3f95236d76..15fde759c7b 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.5,v 1.2 1996/06/26 05:31:17 deraadt Exp $
+.\"	$OpenBSD: ar.5,v 1.3 1998/06/15 17:56:06 mickey Exp $
 .\"	$NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -140,7 +140,8 @@ names longer than 16 characters were truncated, and names with embedded
 spaces (and often trailing spaces) were not supported.
 It has been extended for these reasons,
 as described above.
-This format first appeared in 4.4BSD.
+This format first appeared in
+.Bx 4.4 .
 .Sh COMPATIBILITY
 No archive format is currently specified by any standard.
 .At V
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 53138098d87..e4e8a276083 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: showmount.8,v 1.3 1997/07/17 08:05:01 deraadt Exp $
+.\"	$OpenBSD: showmount.8,v 1.4 1998/06/15 17:56:07 mickey Exp $
 .\"	$NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -93,4 +93,5 @@ as accurately as the mount daemon reports it.
 .Sh HISTORY
 The
 .Nm showmount
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index df427b1c11e..17fc44f7d12 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tset.1,v 1.3 1996/06/26 05:41:57 deraadt Exp $
+.\"	$OpenBSD: tset.1,v 1.4 1998/06/15 17:56:09 mickey Exp $
 .\"	$NetBSD: tset.1,v 1.4.2.1 1995/12/05 02:53:34 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -360,8 +360,9 @@ and
 options have been deleted from the
 .Nm tset
 utility.
-None of them were documented in 4.3BSD and all are of limited utility at
-best.
+None of them were documented in
+.Bx 4.3
+and all are of limited utility at best.
 The
 .Fl a ,
 .Fl d
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index f5f7a501b2d..8ed79b723ab 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whereis.1,v 1.1 1997/04/08 02:44:06 millert Exp $
+.\"	$OpenBSD: whereis.1,v 1.2 1998/06/15 17:56:10 mickey Exp $
 .\"	$NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -79,4 +79,5 @@ utility are no longer available in this version.
 .Sh HISTORY
 The
 .Nm whereis
-command appeared in 3.0BSD.
+command appeared in
+.Bx 3.0 .
diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8
index b2535ae7ed6..2353e36640f 100644
--- a/usr.sbin/amd/amd/amd.8
+++ b/usr.sbin/amd/amd/amd.8
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)amd.8	5.10 (Berkeley) 4/19/94
-.\"	$Id: amd.8,v 1.4 1997/05/30 07:49:35 deraadt Exp $
+.\"	$Id: amd.8,v 1.5 1998/06/15 17:56:12 mickey Exp $
 .\"
 .Dd April, 19, 1994
 .Dt AMD 8
@@ -230,4 +230,5 @@ the features.
 .Sh HISTORY
 The
 .Nm amd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/usr.sbin/amd/fsinfo/fsinfo.8 b/usr.sbin/amd/fsinfo/fsinfo.8
index 53c7355fced..ddf6d2a4785 100644
--- a/usr.sbin/amd/fsinfo/fsinfo.8
+++ b/usr.sbin/amd/fsinfo/fsinfo.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
-.\"	$Id: fsinfo.8,v 1.1 1995/10/18 08:47:19 deraadt Exp $
+.\"	$Id: fsinfo.8,v 1.2 1998/06/15 17:56:13 mickey Exp $
 .\"
 .Dd June 28, 1993
 .Dt FSINFO 8
@@ -75,4 +75,5 @@ command is fully described in the document
 .Sh HISTORY
 The
 .Nm fsinfo
-command first appeared in 4.4BSD.
+command first appeared in
+.Bx 4.4 .
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.8 b/usr.sbin/kvm_mkdb/kvm_mkdb.8
index 0c46dd8a28f..f12078acb63 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.8
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kvm_mkdb.8	8.1 (Berkeley) 6/9/93
-.\"	$Id: kvm_mkdb.8,v 1.2 1996/07/08 22:09:48 ccappuc Exp $
+.\"	$Id: kvm_mkdb.8,v 1.3 1998/06/15 17:56:15 mickey Exp $
 .\"
 .Dd June 9, 1993
 .Dt KVM_MKDB 8
@@ -67,4 +67,5 @@ information about the current system.
 .Sh HISTORY
 The
 .Nm kvm_mkdb
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/usr.sbin/named/man/getnetent.3 b/usr.sbin/named/man/getnetent.3
index 43ac7585ba4..fa9cfedddfc 100644
--- a/usr.sbin/named/man/getnetent.3
+++ b/usr.sbin/named/man/getnetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnetent.3,v 1.2 1997/03/12 10:42:13 downsj Exp $
+.\"	$OpenBSD: getnetent.3,v 1.3 1998/06/15 17:56:16 mickey Exp $
 .\" $From: getnetent.3,v 8.2 1996/05/09 05:59:10 vixie Exp $
 .TH getnetent 3
 .SH NAME
@@ -126,7 +126,8 @@ networks(5)
 RFC 1101
 .SH HISTORY
 The getnetent(), getnetbyaddr(), getnetbyname(), setnetent(), and
-endnetent() functions appeared in 4.2BSD.
+endnetent() functions appeared in
+.Bx 4.2 .
 .SH BUGS
 The data space used by these functions is static; if future use requires the
 data, it should be copied before any subsequent calls to these functions
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index f37e44b9211..e96e440d903 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.14 1998/05/08 04:52:31 millert Exp $
+.\" $OpenBSD: pppd.8,v 1.15 1998/06/15 17:56:17 mickey Exp $
 .\" manual page [] for pppd 2.3
 .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $
 .\" SH section heading
@@ -43,7 +43,8 @@ used.
 .TP
 .I <speed>
 Set the baud rate to <speed> (a decimal number).  On systems such as
-4.4BSD and OpenBSD, any speed can be specified.  Other systems
+.Bx 4.4
+and OpenBSD, any speed can be specified.  Other systems
 (e.g. SunOS) allow only a limited set of speeds.
 .TP
 .B active-filter \fIfilter-expression
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 7712dded3b3..8fc9d7948f4 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -342,4 +342,5 @@ Does not understand NFS swap servers.
 .Sh HISTORY
 The
 .Nm pstat
-command appeared in 4.0BSD.
+command appeared in
+.Bx 4.0 .
diff --git a/usr.sbin/sysctl/sysctl.8 b/usr.sbin/sysctl/sysctl.8
index 985c2a54cae..05cffafab58 100644
--- a/usr.sbin/sysctl/sysctl.8
+++ b/usr.sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.18 1998/06/02 06:10:33 deraadt Exp $
+.\"	$OpenBSD: sysctl.8,v 1.19 1998/06/15 17:56:21 mickey Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -305,4 +305,5 @@ definitions for second level ddb identifiers
 .Xr sysctl 3
 .Sh HISTORY
 .Nm sysctl
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .