diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index f2a4a4a56dea..8919ff75d9fb 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -181,7 +181,9 @@ The value
 .Cm oldascii
 specifies the one used in historic
 .Tn AT&T
-and pre-4.3BSD-reno systems.
+and
+.No pre- Ns Bx 4.3 reno
+systems.
 .It Cm block
 Treats the input as a sequence of newline or end-of-file terminated variable
 length records independent of input and output block boundaries.
@@ -226,7 +228,9 @@ and
 .Cm oldibm
 are maps used in historic
 .Tn AT&T
-and pre-4.3BSD-reno systems.
+and
+.No pre- Ns Bx 4.3 reno
+systems.
 .It Cm lcase
 Transform uppercase characters into lowercase characters.
 .It Cm noerror
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 0e7384b302b4..0e665eb6cb29 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -135,7 +135,9 @@ permissions, are not used by the system and cannot be changed.
 .Pp
 The
 .Bx 4.4
-system differs from historical 4BSD systems in that the system call
+system differs from historical
+.Bx 4
+systems in that the system call
 .Xr chown 2
 has been changed to follow symbolic links.
 The
@@ -238,7 +240,9 @@ option is specified.
 .Pp
 The
 .Bx 4.4
-system differs from historical 4BSD systems in that the
+system differs from historical
+.Bx 4
+systems in that the
 .Nm chown
 and
 .Nm chgrp
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index d9c80f763308..132c2cf02b41 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -727,7 +727,10 @@ by this format) which may be truncated by this format is detected by
 .Nm
 and is repaired.
 .It Ar tar
-The old BSD tar format as found in BSD4.3.
+The old
+.Bx
+tar format as found in
+.Bx 4.3 .
 The default blocksize for this format is 10240 bytes.
 Pathnames stored by this format must be 100 characters or less in length.
 Only
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 6c947ba02e4f..d0879949c20b 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -68,7 +68,7 @@ as per
 .It Fl e
 Display all the current settings for the terminal to standard output
 in the traditional
-.Tn BSD
+.Bx
 ``all'' and ``everything'' formats.
 .It Fl f
 Open and use the terminal named by
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 99783763d66f..1010e79b2ad1 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -343,4 +343,5 @@ file distributed with am-utils.
 .Sh HISTORY
 The
 .Nm amd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index 829ed8fd2444..915e27e97969 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -210,4 +210,5 @@ file distributed with
 .Nm am-utils .
 .Sh HISTORY
 .Nm Amq
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
diff --git a/contrib/telnet/telnetd/telnetd.8 b/contrib/telnet/telnetd/telnetd.8
index 684f8a4c880e..029b8e87a145 100644
--- a/contrib/telnet/telnetd/telnetd.8
+++ b/contrib/telnet/telnetd/telnetd.8
@@ -462,7 +462,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 .
@@ -593,11 +594,13 @@ Some
 .Tn TELNET
 commands are only partially implemented.
 .Pp
-Because of bugs in the original 4.2 BSD
+Because of bugs in the original
+.Bx 4.2
 .Xr telnet 1 ,
 .Nm
 performs some dubious protocol exchanges to try to discover if the remote
-client is, in fact, a 4.2 BSD
+client is, in fact, a
+.Bx 4.2
 .Xr telnet 1 .
 .Pp
 Binary mode
diff --git a/crypto/telnet/telnetd/telnetd.8 b/crypto/telnet/telnetd/telnetd.8
index 684f8a4c880e..029b8e87a145 100644
--- a/crypto/telnet/telnetd/telnetd.8
+++ b/crypto/telnet/telnetd/telnetd.8
@@ -462,7 +462,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 .
@@ -593,11 +594,13 @@ Some
 .Tn TELNET
 commands are only partially implemented.
 .Pp
-Because of bugs in the original 4.2 BSD
+Because of bugs in the original
+.Bx 4.2
 .Xr telnet 1 ,
 .Nm
 performs some dubious protocol exchanges to try to discover if the remote
-client is, in fact, a 4.2 BSD
+client is, in fact, a
+.Bx 4.2
 .Xr telnet 1 .
 .Pp
 Binary mode
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 0ac3090fa9f6..f0256b1f1c5a 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -153,4 +153,5 @@ default output file.
 .Sh HISTORY
 The
 .Nm
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 2c6c4f563329..f60de7ffd03e 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -239,7 +239,8 @@ Discard all local symbols in the input files.
 Trace the manipulations inflicted on
 .Ar symbol
 .It Fl Z
-Make a 386BSD
+Make a
+.Bx 386
 .Dv ZMAGIC
 output file.
 .It Fl z
diff --git a/gnu/usr.bin/ld/ld.1aout b/gnu/usr.bin/ld/ld.1aout
index 4af8896820e8..0592d985877b 100644
--- a/gnu/usr.bin/ld/ld.1aout
+++ b/gnu/usr.bin/ld/ld.1aout
@@ -239,7 +239,8 @@ Discard all local symbols in the input files.
 Trace the manipulations inflicted on
 .Ar symbol
 .It Fl Z
-Make a 386BSD
+Make a
+.Bx 386
 .Dv ZMAGIC
 output file.
 .It Fl z
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
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index d6fcae9a4d75..f166318da8bd 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -451,7 +451,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 .
@@ -608,11 +609,13 @@ Some
 .Tn TELNET
 commands are only partially implemented.
 .Pp
-Because of bugs in the original 4.2 BSD
+Because of bugs in the original
+.Bx 4.2
 .Xr telnet 1 ,
 .Nm
 performs some dubious protocol exchanges to try to discover if the remote
-client is, in fact, a 4.2 BSD
+client is, in fact, a
+.Bx 4.2
 .Xr telnet 1 .
 .Pp
 Binary mode
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 8432686e8c8a..84f86b094bfe 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -886,7 +886,9 @@ or
 thus replacing the
 .Em fdisk
 table by the dummy one in the bootstrap program.  This is only of
-concern if the disk is fully dedicated, so that the BSD disklabel
+concern if the disk is fully dedicated, so that the
+.Bx
+disklabel
 starts at absolute block 0 on the disk.
 .Pp
 .Nm
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 691429ce45e9..661839762619 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -717,7 +717,9 @@ utility and
 .Xr scsi 3
 library, written by Julian Elischer and Peter Dufault.  The
 .Xr scsi 8
-program first appeared in 386BSD 0.1.2.4, and first appeared in
+program first appeared in
+.Bx 386 0.1.2.4 ,
+and first appeared in
 .Fx
 in
 .Fx 2.0.5 .
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index b3e154ec76b0..eee6542ac442 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -57,6 +57,7 @@ dialout devices
 .Sh AUTHORS
 .An Christopher G. Demetriou
 .Sh HISTORY
-Originally part of cgd's com package patches, version 0.2.1, to 386BSD 0.1.
+Originally part of cgd's com package patches, version 0.2.1, to
+.Bx 386 0.1 .
 Once controlled bidirectional capabilities.  Little is left to control now
 that these capabilities are standard.
diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8
index 40ebf79c4989..62b06e35fbd3 100644
--- a/sbin/cxconfig/cxconfig.8
+++ b/sbin/cxconfig/cxconfig.8
@@ -57,10 +57,14 @@ implementation is used (see RFC-1548, RFC-1549).
 .It cisco
 Set the link-level protocol: Cisco/HDLC (see RFC-1547).
 This protocol is intended for compatibility with old models of Cisco routers,
-and with early versions of BSD/386 drivers.
+and with early versions of
+.Tn BSD/386
+drivers.
 The extensive usage of this protocol is not recommended.
 .It ext
-Use the external link-level protocol suite (for BSD/386 only).
+Use the external link-level protocol suite (for
+.Tn BSD/386
+only).
 .It "+keepalive, -keepalive"
 Enable the automatic line state control sub-protocol.
 This setting is not significant when the external link-level protocol is used.
@@ -297,7 +301,8 @@ cxconfig cx0 hdlc 256000 cisco +keepalive -extclock
 ifconfig cx0 200.1.1.1 200.1.1.2 up
 .Ed
 .Pp
-Set up the channel 1 of the adapter Sigma-840 under BSD/386.
+Set up the channel 1 of the adapter Sigma-840 under
+.Tn BSD/386 .
 Synchronous 64 kbit/sec leased line, external clock source.
 Synchronous mode, interface V.35, external protocol suite:
 .Bd -literal
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 8432686e8c8a..84f86b094bfe 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -886,7 +886,9 @@ or
 thus replacing the
 .Em fdisk
 table by the dummy one in the bootstrap program.  This is only of
-concern if the disk is fully dedicated, so that the BSD disklabel
+concern if the disk is fully dedicated, so that the
+.Bx
+disklabel
 starts at absolute block 0 on the disk.
 .Pp
 .Nm
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 40ebf79c4989..62b06e35fbd3 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -57,10 +57,14 @@ implementation is used (see RFC-1548, RFC-1549).
 .It cisco
 Set the link-level protocol: Cisco/HDLC (see RFC-1547).
 This protocol is intended for compatibility with old models of Cisco routers,
-and with early versions of BSD/386 drivers.
+and with early versions of
+.Tn BSD/386
+drivers.
 The extensive usage of this protocol is not recommended.
 .It ext
-Use the external link-level protocol suite (for BSD/386 only).
+Use the external link-level protocol suite (for
+.Tn BSD/386
+only).
 .It "+keepalive, -keepalive"
 Enable the automatic line state control sub-protocol.
 This setting is not significant when the external link-level protocol is used.
@@ -297,7 +301,8 @@ cxconfig cx0 hdlc 256000 cisco +keepalive -extclock
 ifconfig cx0 200.1.1.1 200.1.1.2 up
 .Ed
 .Pp
-Set up the channel 1 of the adapter Sigma-840 under BSD/386.
+Set up the channel 1 of the adapter Sigma-840 under
+.Tn BSD/386 .
 Synchronous 64 kbit/sec leased line, external clock source.
 Synchronous mode, interface V.35, external protocol suite:
 .Bd -literal
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 043ee57b7668..cafd2a3d119c 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -155,10 +155,14 @@ There is a 60 second delay between each attempt.
 Use TCP transport instead of UDP.
 This is recommended for servers that are not on the same LAN cable as
 the client.
-(NB: This is NOT supported by most non-BSD servers.)
+(NB: This is NOT supported by most
+.No non- Ns Bx
+servers.)
 .It Fl U
 Force the mount protocol to use UDP transport, even for TCP NFS mounts.
-(Necessary for some old BSD servers.)
+(Necessary for some old
+.Bx
+servers.)
 .It Fl a
 Set the read-ahead count to the specified value.
 This may be in the range of 0 - 4, and determines how many blocks
@@ -349,4 +353,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_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index fa1855b7eab9..87f3e9218ffb 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -215,7 +215,9 @@ Documentation from NetWare NDK.
 .Pp
 Ncpfs for Linux - written by
 .An Volker Lendecke Aq lendecke@math.uni\-goettingen.de .
-He granted me permission to publish parts of his code under BSD-style license,
+He granted me permission to publish parts of his code under
+.Bx Ns -style
+license,
 .Pp
 "Interrupt List" from
 .An Ralf Brown ,
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index e55554c7f593..3f26ded91812 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -82,7 +82,7 @@ Volume label (up to 11 characters).  The label should consist of
 only those characters permitted in regular DOS (8+3) filenames.
 .It Fl O Ar OEM
 OEM string (up to 8 characters).  The default is
-"BSD  4.4".
+.Qq Li "BSD  4.4" .
 .It Fl S Ar sector-size
 Number of bytes per sector.  Acceptable values are powers of 2
 in the range 128 through 32768.
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 2fb68aa894b2..05c44c76aa82 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -144,7 +144,9 @@ SCSI disk on any supported SCSI controller
 The unit number of the drive on the interface being used.
 0 for the first drive, 1 for the second drive, etc.
 .It Ar part
-The partition letter inside the BSD portion of the disk.  See
+The partition letter inside the
+.Bx
+portion of the disk.  See
 .Xr disklabel 8 .
 By convention, only partition
 .Ql a
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 376254b13819..0912de30a514 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -721,7 +721,9 @@ Data link protocols with variable length headers are not currently supported.
 .Sh HISTORY
 The Enet packet filter was created in 1980 by Mike Accetta and
 Rick Rashid at Carnegie-Mellon University.  Jeffrey Mogul, at
-Stanford, ported the code to BSD and continued its development from
+Stanford, ported the code to
+.Bx
+and continued its development from
 1983 on.  Since then, it has evolved into the Ultrix Packet Filter
 at
 .Tn DEC ,
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index f5128fe709d5..c30059d4c3b1 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -105,7 +105,8 @@ have the latest firmware for your controller.
 .Sh AUTHORS
 .An -nosplit
 .An Julian Elischer
-wrote a driver for the Multimaster cards that appeared in the 386BSD
+wrote a driver for the Multimaster cards that appeared in the
+.Bx 386
 patch kit.  The driver was rewritten by
 .An Justin T. Gibbs
 to take advantage of new board features and work with the CAM SCSI framework in
@@ -133,4 +134,6 @@ ISA/VL Bus Driver Attachment
 .Sh HISTORY
 The
 .Nm
-driver first appeared in the 386BSD patch kit.
+driver first appeared in the
+.Bx 386
+patch kit.
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 9c6b471fe8d9..539cf265c29e 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -451,7 +451,9 @@ This
 .Nm
 driver is based upon the
 .Nm
-driver written by Julian Elischer, which appeared in 386BSD 0.1.  The
+driver written by Julian Elischer, which appeared in
+.Bx 386 0.1 .
+The
 CAM version of the
 .Nm
 driver was written by Kenneth Merry and first appeared in
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index fd51ee501e8a..19f53230954b 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -304,4 +304,5 @@ codes to the ioctls described here.
 .Sh HISTORY
 The
 .Nm
-driver appeared in 386BSD 0.1.
+driver appeared in
+.Bx 386 0.1 .
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 3c0bec55b2e7..e33707dafca6 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -579,7 +579,8 @@ methods.
 .Sh HISTORY
 The
 .Nm
-debugger was developed for Mach, and ported to 386BSD 0.1.
+debugger was developed for Mach, and ported to
+.Bx 386 0.1 .
 This manual page translated from
 .Fl man
 macros by Garrett Wollman.
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 3186bfc93102..11136fa719c0 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -122,7 +122,9 @@ and may be supported by future versions of the driver.
 .Sh FILES
 .Bl -tag -width /dev/(r)mcd0a -compact
 .It Pa /dev/(r)mcd0a
-accesses BSD partition on the disc.
+accesses
+.Bx
+partition on the disc.
 Normally, there is only
 one file system on a CD-ROM disc.
 .It Pa /dev/(r)mcd0c
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index 3f65da442185..a1668f54714d 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -43,7 +43,9 @@ card or a compatible clone.
 .Sh FILES
 .Bl -tag -width /dev/[r]scd0a -compact
 .It Pa /dev/[r]scd0a
-accesses BSD partition on the disc.
+accesses
+.Bx
+partition on the disc.
 Normally, there is only
 one file system on a CDROM disc.
 .It Pa /dev/[r]scd0c
diff --git a/share/man/man4/man4.i386/streams.4 b/share/man/man4/man4.i386/streams.4
index 0530342f7fb9..53134b14d184 100644
--- a/share/man/man4/man4.i386/streams.4
+++ b/share/man/man4/man4.i386/streams.4
@@ -65,7 +65,9 @@ This whole interface is a crude hack to produce STREAMS semantics
 through emulation over sockes.
 .Pp
 Programmers who hope to be able to use this interface to provide
-SVR4 STREAMS services to BSD applications will be sorely disappointed.
+SVR4 STREAMS services to
+.Bx
+applications will be sorely disappointed.
 .Sh SEE ALSO
 .Xr svr4 4
 .Sh HISTORY
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index fc40de17b9ac..c875bb878c59 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -7,7 +7,9 @@
 .Nm natm
 .Nd Native Mode ATM protocol layer
 .Sh DESCRIPTION
-The BSD ATM software comes with a
+The
+.Bx
+ATM software comes with a
 .Em native mode ATM protocol layer
 which provides socket level access to AAL0 and AAL5 virtual circuits.
 To enable this protocol layer, add
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index c6b77fb9ac72..d18e9b00b0d3 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -297,7 +297,8 @@ An example is the node type
 .Em socket
 which is both a netgraph node and a
 .Xr socket 2
-BSD socket in the protocol family
+.Bx
+socket in the protocol family
 .Dv PF_NETGRAPH .
 Socket nodes allow user processes to participate in
 .Nm .
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index 2dd2e44d0ab3..19ccae02402b 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -45,7 +45,9 @@
 .Sh DESCRIPTION
 A
 .Nm ksocket
-node is both a netgraph node and a BSD socket.  The
+node is both a netgraph node and a
+.Bx
+socket.  The
 .Nm
 node type allows one to open a socket inside the kernel and have
 it appear as a Netgraph node.  The
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 34de448edaae..dc53d8856956 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -47,11 +47,15 @@
 .Sh DESCRIPTION
 A
 .Nm socket
-node is both a BSD socket and a netgraph node.  The
+node is both a
+.Bx
+socket and a netgraph node.  The
 .Nm
 node type allows user-mode processes to participate in the kernel
 .Xr netgraph 4
-networking subsystem using the BSD socket interface. The process must have
+networking subsystem using the
+.Bx
+socket interface. The process must have
 root privileges to be able to create netgraph sockets however once created,
 any process that has one may use it.
 .Pp
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 92ecc5b466fe..33bd28bfd226 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -691,7 +691,8 @@ Documents the various compile-time options to tailor
 .Sh HISTORY
 The
 .Nm
-driver has been developed for and contributed to 386BSD 0.1.
+driver has been developed for and contributed to
+.Bx 386 0.1 .
 Since then
 .Nm
 has become a standard part of
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 079f0127c53f..c2d8e0f0f85b 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -100,13 +100,17 @@ Currently the following screen saver modules are available:
 .It Pa blank_saver.ko
 This screen saver simply blanks the screen.
 .It Pa daemon_saver.ko
-Animated BSD Daemon screen saver.
+Animated
+.Bx
+Daemon screen saver.
 .It Pa fade_saver.ko
 The screen will gradually fade away.
 .It Pa green_saver.ko
 If the monitor supports power saving mode, it will be turned off.
 .It Pa logo_saver.ko
-Animated graphical BSD Daemon.
+Animated graphical
+.Bx
+Daemon.
 .It Pa rain_saver.ko
 Draws a shower on the screen.
 .It Pa snake_saver.ko
diff --git a/share/man/man4/sym.4 b/share/man/man4/sym.4
index d4eaeddd6638..149f4afdf13d 100644
--- a/share/man/man4/sym.4
+++ b/share/man/man4/sym.4
@@ -299,7 +299,9 @@ which was ported from the
 driver to Linux-1.2.13.
 The original
 .Xr ncr 4
-driver was written for 386BSD and
+driver was written for
+.Bx 386
+and
 .Fx
 by
 .An Wolfgang Stanglmeier
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index e7050342af47..3ef05eec0fda 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -554,7 +554,9 @@ segment resides in memory.
 .It Dv p_paddr
 On systems for which physical addressing is relevant, this member is
 reserved for the segment's physical address.
-Under BSD this member is
+Under
+.Bx
+this member is
 not used and must be zero.
 .It Dv p_filesz
 This member holds the number of bytes in the file image of the segment.
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index ec208fa71eff..b88515ea2141 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -37,7 +37,8 @@
 .Fd #include <time.h>
 .Sh DESCRIPTION
 .Ql HZ
-is not part of the application interface in BSD.
+is not part of the application interface in
+.Bx .
 .Pp
 There are many different real and virtual (timekeeping) clocks with
 different frequencies:
@@ -107,14 +108,18 @@ The mc14618a clock.  This is a real clock with a nominal frequency of
 clock.  It isn't available to applications.
 .It
 The microseconds clock.  This is a virtual clock with frequency
-1000000.  It is used for most timekeeping in BSD and is exported
+1000000.  It is used for most timekeeping in
+.Bx
+and is exported
 to applications in
 .Xr getrusage 2 ,
 .Xr gettimeofday 2 ,
 .Xr select 2 ,
 .Xr getitimer 2 ,
 etc...  This is the clock that should normally be used
-by BSD applications.
+by
+.Bx
+applications.
 .It
 The i8254 clock.  This is a real clock/timer with a nominal frequency of
 1193182.  It is divided down to give the scheduling clock.  It isn't
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 30adea4ca458..a4138434cdf4 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -588,7 +588,8 @@ see
 .Xr tzfile 5
 .El
 .It Pa src/
-BSD, third-party, and/or local source files
+.Bx ,
+third-party, and/or local source files
 .Pp
 .Bl -tag -width "kerberosIV/" -compact
 .It Pa bin/
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index d78db81f4b45..2e830e0e24ca 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -40,7 +40,9 @@ administrators to install applications.
 Each
 .Em port
 contains any patches necessary to make the original
-application source code compile and run on BSD.  Compiling an
+application source code compile and run on
+.Bx .
+Compiling an
 application is as simple as typing
 .Ic make build
 in the port directory!  The
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index d7b040a4e2dd..1cb830933c75 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -502,7 +502,8 @@ and attempts to restore the chain to its original state.
 See above.
 .Sh HISTORY
 .\" Please correct me if I'm wrong
-Mbufs appeared in an early version of BSD.
+Mbufs appeared in an early version of
+.Bx .
 Besides for being used for network packets, they were used
 to store various dynamic structures, such as routing table
 entries, interface addresses, protocol control blocks, etc.
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index 0cdec81e1668..eeb191b2227a 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -85,7 +85,9 @@ is a test macro that sorts out when extensions should be
 visible.  It is defined in <sys/_posix.h>.
 .Pp
 In normal C program development
-only _POSIX_VERSION is set, permitting BSD extensions to
+only _POSIX_VERSION is set, permitting
+.Bx
+extensions to
 appear to the programs.  However, when adding new functionality mandated
 by POSIX.1B, it
 is important to satisfy the requirements added by the
@@ -99,16 +101,21 @@ is present to conditionalize POSIX.1B extensions that were historically
 in the system.  These are visible when _POSIX_SOURCE and _POSIX_C_SOURCE
 are not set at all or when _POSIX_C_SOURCE enables POSIX.1B features.
 The intent of this feature test is to permit hiding the new extensions
-while still letting BSD extensions show up to avoid breaking existing
+while still letting
+.Bx
+extensions show up to avoid breaking existing
 programs without trying to use the "big hammer" of _POSIX_C_SOURCE.
 .Pp
 Some recent additions to header files
 are new enough that they should be changed to
 be dependent on _P1003_1B_VISIBLE instead of _HISTORICALLY.
 .Pp
-Traditional BSD headers (e.g., mmap.h) now specified
+Traditional
+.Bx
+headers (e.g., mmap.h) now specified
 in POSIX.1B can include <sys/_posix.h> and conditionalize
-BSD extensions on _P1003_1B_VISIBLE_HISTORICALLY.
+.Bx
+extensions on _P1003_1B_VISIBLE_HISTORICALLY.
 .Sh NON STANDARD TEST MACROS
 .Bd -literal -offset 0i
 _P1003_1B_INCLUDE_MAYBES
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 7f59c8952ddc..22ce8ae74afe 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -593,8 +593,8 @@ or
 .Sh HISTORY
 This man page is largely based on the src/admin/style/style file from
 the
-.Tn BSD
-4.4-Lite2 release, with updates to reflect the current practice and
+.Bx 4.4 Lite2
+release, with updates to reflect the current practice and
 desire of the
 .Fx
 project.
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 41a5096e7826..965b719de3c1 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -209,6 +209,8 @@ in the paper
 .%T "Hashed and Hierarchical Timing Wheels: Data Structures for the Efficient Implementation of a Timer Facility"
 in the
 .%B "Proceedings of the 11th ACM Annual Symposium on Operating Systems Principles" .
-The current implementation replaces the long standing BSD linked list
+The current implementation replaces the long standing
+.Bx
+linked list
 callout mechanism which offered O(n) insertion and removal running time
 but did not generate or require handles for untimeout operations.
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 85ba2f80e21e..c48967a0b49c 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -158,7 +158,9 @@ entries, and that one by random selection.
 The
 .Ar group
 field is the group that the user will be placed in at login.
-Since BSD supports multiple groups (see
+Since
+.Bx
+supports multiple groups (see
 .Xr groups 1 )
 this field currently has little special meaning.
 This field may be filled in with either a number or a group name (see
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index e50aa0016cb9..d641443ddeae 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -760,4 +760,5 @@ For this to work, the X programmer's kit must have been installed.
 .Sh HISTORY
 The
 .Nm
-program first appeared in BSD/386.
+program first appeared in
+.Tn BSD/386 .
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index cd81f41ef4ce..b7f35c0c3f87 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -55,7 +55,9 @@ releases the lock, and removes the
 .Ar file
 unless the
 .Fl k
-option is specified.  BSD-style locking is used, as described in
+option is specified.
+.Bx Ns -style
+locking is used, as described in
 .Xr flock 2 ;
 the mere existence of the
 .Ar file
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 657dd5f567f2..47b67b1d9374 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -336,7 +336,9 @@ command appeared in
 .Pp
 Extensions regarding the
 .Xr st 4
-driver appeared in 386BSD 0.1 as a separate
+driver appeared in
+.Bx 386 0.1
+as a separate
 .Xr st 1
 command, and have been merged into the
 .Nm
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 9adc13299f3b..f46a95c6f224 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -249,7 +249,9 @@ Strip out non-printable characters from file1.
 .D1 Li "tr -cd \*q[:print:]\*q < file1"
 .Sh COMPATIBILITY
 System V has historically implemented character ranges using the syntax
-``[c-c]'' instead of the ``c-c'' used by historic BSD implementations and
+``[c-c]'' instead of the ``c-c'' used by historic
+.Bx
+implementations and
 standardized by POSIX.
 System V shell scripts should work under this implementation as long as
 the range is intended to map in another range, i.e. the command
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 574e5dd39eae..185aafc0fcd0 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -358,7 +358,9 @@ and
 options have been deleted from the
 .Nm
 utility.
-None of them were documented in 4.3BSD and all are of limited utility at
+None of them were documented in
+.Bx 4.3
+and all are of limited utility at
 best.
 The
 .Fl a ,
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 7c81926f68cd..f51c82f1d2b3 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -97,7 +97,10 @@ characters delimited by <space>, <tab> or <newline> characters''.
 The implementation, however, didn't handle non-printing characters
 correctly so that ``  ^D^E  '' counted as 6 spaces, while ``foo^D^Ebar''
 counted as 8 characters.
-4BSD systems after 4.3BSD modified the implementation to be consistent
+.Bx 4
+systems after
+.Bx 4.3
+modified the implementation to be consistent
 with the documentation.
 This implementation defines a ``word'' in terms of the
 .Xr isspace 3
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index 30ecf0285b07..d3ed35333d88 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -154,7 +154,9 @@ user in
 .Pa /tmp
 or
 .Pa /var/tmp
-as symbolic links on 4.4BSD filesystems do not contain information
+as symbolic links on
+.Bx 4.4
+filesystems do not contain information
 as to who created them.  Also, there may be other files created in
 .Pa /var/mail
 other than
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 423e362f5021..834d4cca9df6 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -52,7 +52,9 @@ Note that what are referred to here as
 .Dq slices
 are typically called
 .Dq partitions
-in non-BSD documentation relating to the PC.
+in
+.No non- Ns Bx
+documentation relating to the PC.
 Typically, only non-removable disks are sliced.
 .Pp
 The
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index 2254feeb9c3b..5dc37b024a09 100644
--- a/usr.sbin/ckdist/ckdist.1
+++ b/usr.sbin/ckdist/ckdist.1
@@ -92,6 +92,10 @@ Exit status is 0 if no errors were detected, 1 if errors were found in
 a distribution, and 2 if usage errors, inaccessible input files, or
 other system errors were encountered.
 .Sh NOTES
-Both BSD and DOS versions of
+Both
+.Bx
+and
+.Tn DOS
+versions of
 .Nm
 are available.
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 17dc78665f95..9eeab242ee2a 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -157,12 +157,16 @@ to extract the configuration information, use the command
 strings kernel | grep ___
 .Ed
 .Sh DEBUG KERNELS
-Traditional BSD kernels compiled without symbols due to the heavy load on the
+Traditional
+.Bx
+kernels compiled without symbols due to the heavy load on the
 system when compiling a
 .Dq debug
 kernel.  A debug kernel contains complete symbols for all the source files, and
 enables an experienced kernel programmer to analyse the cause of a problem.  The
-debuggers available prior to 4.4BSD-Lite were able to find some information
+debuggers available prior to
+.Bx 4.4 Lite
+were able to find some information
 from a normal kernel;
 .Xr gdb 1
 provides very little support for normal kernels, and a debug kernel is needed
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index e0eb764eedd0..ec3dd558c8fe 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -86,7 +86,9 @@ may not.
 .Ev LOGNAME
 variable is sometimes called
 .Ev USER
-on BSD systems...
+on
+.Bx
+systems...
 On these systems,
 .Ev USER
 will be set also).
@@ -223,20 +225,33 @@ MAILTO=paul
 .Xr cron 8
 .Sh EXTENSIONS
 When specifying day of week, both day 0 and day 7 will be considered Sunday.
-BSD and ATT seem to disagree about this.
+.Bx
+and
+.Tn ATT
+seem to disagree about this.
 .Pp
 Lists and ranges are allowed to co-exist in the same field.  "1-3,7-9" would
-be rejected by ATT or BSD cron -- they want to see "1-3" or "7,8,9" ONLY.
+be rejected by
+.Tn ATT
+or
+.Bx
+cron -- they want to see "1-3" or "7,8,9" ONLY.
 .Pp
 Ranges can include "steps", so "1-9/2" is the same as "1,3,5,7,9".
 .Pp
 Names of months or days of the week can be specified by name.
 .Pp
-Environment variables can be set in the crontab.  In BSD or ATT, the
+Environment variables can be set in the crontab.  In
+.Bx
+or
+.Tn ATT ,
+the
 environment handed to child processes is basically the one from
 .Pa /etc/rc .
 .Pp
-Command output is mailed to the crontab owner (BSD can't do this), can be
+Command output is mailed to the crontab owner
+.No ( Bx
+can't do this), can be
 mailed to a person other than the crontab owner (SysV can't do this), or the
 feature can be turned off and no mail will be sent at all (SysV can't do this
 either).
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index dce1e4a59bfb..d925d9809d96 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -75,7 +75,9 @@ hiding all unnecessary symbols.
 .Nm
 places specific requirements on package
 .Pa Makefile Ns s
-which make it unsuitable for use with non-BSD sources.
+which make it unsuitable for use with
+.No non- Ns Bx
+sources.
 In particular, the
 .Pa Makefile
 must contain the target
@@ -417,7 +419,9 @@ Some shuffling in the order of
 libraries may be required, and in some rare cases two libraries may
 have an unresolvable conflict and thus cannot be crunched together.
 .Pp
-Some versions of the BSD build environment do not by default build the
+Some versions of the
+.Bx
+build environment do not by default build the
 intermediate object file for single-source file programs.
 The
 .Dq Li make objs
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index e5ba6ce39ef7..d568181d85f6 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -157,7 +157,8 @@ appropriate information written to diagnostic output).
 .Xr newfs_msdos 8
 .Sh HISTORY
 .Nm Fdformat
-has been developed for 386BSD 0.1
+has been developed for
+.Bx 386 0.1
 and upgraded to the new
 .Xr fdc 4
 floppy disk driver.
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 77836bfed820..a1be3fac88f9 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -180,7 +180,8 @@ There are two types of services that
 can start: standard and TCPMUX.
 A standard service has a well-known port assigned to it;
 it may be a service that implements an official Internet standard or is a
-BSD-specific service.
+.Bx Ns -specific
+service.
 As described in
 .Tn RFC 1078 ,
 TCPMUX services are nonstandard services that do not have a
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index fa1855b7eab9..87f3e9218ffb 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -215,7 +215,9 @@ Documentation from NetWare NDK.
 .Pp
 Ncpfs for Linux - written by
 .An Volker Lendecke Aq lendecke@math.uni\-goettingen.de .
-He granted me permission to publish parts of his code under BSD-style license,
+He granted me permission to publish parts of his code under
+.Bx Ns -style
+license,
 .Pp
 "Interrupt List" from
 .An Ralf Brown ,