23 files changed, 83 insertions, 32 deletions
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 376254b..0912de3 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 f5128fe..c30059d 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 9c6b471..539cf26 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 fd51ee5..19f5323 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 3c0bec5..e33707d 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 3186bfc..11136fa 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 3f65da4..a1668f5 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 0530342..53134b1 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 fc40de1..c875bb8 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 c6b77fb..d18e9b0 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 2dd2e44..19ccae0 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 34de448..dc53d88 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 92ecc5b..33bd28b 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 079f012..c2d8e0f 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 d4eaedd..149f4af 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 e705034..3ef05ee 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 ec208fa..b88515e 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 30adea4..a413843 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 d78db81..2e830e0 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 d7b040a..1cb8309 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 0cdec81..eeb191b 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 7f59c89..22ce8ae 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 41a5096..965b719 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.