4 files changed, 21 insertions, 9 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 .