9 files changed, 46 insertions, 17 deletions
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
index eac3a528a6a3..d17ffd2a933c 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -122,7 +122,8 @@ netgroup database file
 The netgroup members have three string fields to maintain compatibility
 with other vendor implementations, however it is not obvious what use the
 .Sy domain
-string has within BSD.
+string has within
+.Bx .
 .Sh BUGS
 The function
 .Fn getnetgrent
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 877445e60f12..1f9f9505a2b0 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -472,7 +472,9 @@ member of
 Note that you should not assign SIG_DFL or SIG_IGN this way.
 .Pp
 If the SA_SIGINFO flag is not set, the handler function should match
-either the ANSI C or traditional BSD prototype and be pointed to by
+either the ANSI C or traditional
+.Bx
+prototype and be pointed to by
 the
 .Dv sa_handler
 member of
@@ -486,9 +488,13 @@ The
 member declaration in
 .Fx
 include files is that of ANSI C (as required by POSIX),
-so a function pointer of a BSD-style function needs to be casted to
+so a function pointer of a
+.Bx Ns -style
+function needs to be casted to
 compile without warning.
-The traditional BSD style is not portable and since its capabilities
+The traditional
+.Bx
+style is not portable and since its capabilities
 are a full subset of a SA_SIGINFO handler,
 its use is deprecated.
 .Pp
@@ -500,7 +506,9 @@ values from <signal.h>.
 .Pp
 The
 .Fa code
-argument of the BSD-style handler and the
+argument of the
+.Bx Ns -style
+handler and the
 .Dv si_code
 member of the
 .Dv info
@@ -514,7 +522,9 @@ values for SIGFPE.
 .Pp
 The
 .Fa scp
-argument to a BSD-style handler points to an instance of struct
+argument to a
+.Bx Ns -style
+handler points to an instance of struct
 sigcontext.
 .Pp
 The
@@ -567,7 +577,7 @@ as are the signals,
 and
 .Dv SIGINFO .
 Those signals are available on most
-.Tn BSD Ns \-derived
+.Bx Ns \-derived
 systems.
 The
 .Dv SA_NODEFER
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index 6325b819c0bf..cc7ca47fc62f 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -85,7 +85,7 @@ This system call is used by the trampoline code and
 when returning from a signal to the previously executing program.
 .Sh NOTES
 This system call is not available in 4.2
-.Tn BSD
+.Bx
 hence it should not be used if backward compatibility is needed.
 .Sh RETURN VALUES
 If successful, the system call does not return.
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index 2fae4fc8cca0..d1fe935bff55 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -100,4 +100,5 @@ points outside the process's allocated address space.
 .Sh HISTORY
 An
 .Fn undelete
-function call first appeared in 4.4BSD-Lite.
+function call first appeared in
+.Bx 4.4 Lite .
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index df920da1899b..e7612491a7d5 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -522,7 +522,10 @@ go here; Peter Dufault first read about it in a 1989 Sun Expert magazine.
 The new CCB data structures are derived from the CAM-2 and CAM-3
 specifications.
 .Pp
-Peter Dufault implemented a clone of SGI's interface in 386bsd that
+.An Peter Dufault
+implemented a clone of SGI's interface in
+.Bx 386
+that
 led to the original
 .Fx
 .Tn SCSI
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 19ae37a3182a..8f3c9cf7d9ab 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -180,7 +180,9 @@ values for a
 .It CHUNK_PAST_1024
 This chunk cannot be booted from because it extends past cylinder 1024.
 .It CHUNK_BSD_COMPAT
-This chunk is in the BSD-compatibility, and has a short name too, i.e.\&
+This chunk is in the
+.Bx Ns -compatibility ,
+and has a short name too, i.e.\&
 .Ql wd0s4f -> wd0f .
 .It CHUNK_ALIGN
 This chunk should be aligned.
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index 5382ae3b7773..560f83d8a018 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -72,7 +72,9 @@ Accordingly, the generic portion of the interface (i.e.,
 .Fn kvm_write ,
 and
 .Fn kvm_nlist )
-has been incorporated into the BSD interface.  Indeed, many kvm
+has been incorporated into the
+.Bx
+interface.  Indeed, many kvm
 applications (i.e., debuggers and statistical monitors) use only
 this subset of the interface.
 .Pp
@@ -84,7 +86,9 @@ Finally, the Sun kvm error reporting semantics are poorly defined.
 The library can be configured either to print errors to stderr automatically,
 or to print no error messages at all.
 In the latter case, the nature of the error cannot be determined.
-To overcome this, the BSD interface includes a
+To overcome this, the
+.Bx
+interface includes a
 routine,
 .Xr kvm_geterr 3 ,
 to return (not print out) the error message
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index c22c49cd8872..b3b0441c2bc9 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -131,7 +131,9 @@ call.
 .Pp
 The
 .Fn kvm_openfiles
-function provides BSD style error reporting.
+function provides
+.Bx
+style error reporting.
 Here, error messages are not printed out by the library.
 Instead, the application obtains the error message
 corresponding to the most recent kvm library call using
@@ -174,7 +176,9 @@ function returns 0 on success and -1 on failure.
 .Sh BUGS
 There should not be two open calls.  The ill-defined error semantics
 of the Sun library and the desire to have a backward-compatible library
-for BSD left little choice.
+for
+.Bx
+left little choice.
 .Sh SEE ALSO
 .Xr open 2 ,
 .Xr kvm 3 ,
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index c7f76e289702..dba6ef7fe6f7 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -35,7 +35,9 @@
 .Sh DESCRIPTION
 .Nm
 provides a set of supporting functions for standalone
-applications, mimicking where possible the standard BSD programming
+applications, mimicking where possible the standard
+.Bx
+programming
 environment.  The following sections group these functions by kind.
 Unless specifically described here, see the corresponding section 3
 manpages for the given functions.
@@ -573,7 +575,9 @@ structures.  The following filesystem handlers are supplied by
 the consumer may supply other filesystems of their own:
 .Bl -hang -width "cd9660_fsops "
 .It ufs_fsops
-The BSD UFS.
+The
+.Bx
+UFS.
 .It ext2fs_fsops
 Linux ext2fs filesystem.
 .It tftp_fsops