10 files changed, 43 insertions, 16 deletions
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 8432686..84f86b0 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 691429c..6618397 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 b3e154e..eee6542 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 40ebf79..62b06e3 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 8432686..84f86b0 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 40ebf79..62b06e3 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 043ee57..cafd2a3 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 fa1855b..87f3e92 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 e55554c..3f26ded 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 2fb68aa..05c44c7 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