Use Fx macro wherever possible.

52 files changed, 245 insertions, 141 deletions

diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index d9152d9..5287da2 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -204,7 +204,9 @@ Push the specified cancellation cleanup handler onto the calling thread's
 cancellation stack.
 .El
 .Sh INSTALLATION
-The current FreeBSD POSIX thread implementation is built in the library
+The current
+.Fx
+POSIX thread implementation is built in the library
 .Fa libc_r
 which contains both thread-safe libc functions and the thread functions.
 This library replaces
@@ -218,13 +220,15 @@ is built as part of a 'make world'.  To disable the build of
 you must supply the '-DNOLIBC_R' option to
 .Xr make 1 .
 .Pp
-A FreeBSD specific option has been added to gcc to make linking
+A
+.Fx
+specific option has been added to gcc to make linking
 threaded processes simple.
 .Fa gcc -pthread
 links a threaded process against
 .Fa libc_r
 instead of
-.Fa libc.
+.Fa libc .
 .Sh SEE ALSO
 .Xr pthread_create 3 ,
 .Xr pthread_detach 3 ,
diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3
index 9aa9a52..6b8a983 100644
--- a/share/man/man3/pthread_condattr.3
+++ b/share/man/man3/pthread_condattr.3
@@ -44,7 +44,8 @@
 .Sh DESCRIPTION
 Condition attribute objects are used to specify parameters to
 .Fn pthread_cond_init .
-FreeBSD's implementation of conditions does not support any non-default
+.Fx Ns 's
+implementation of conditions does not support any non-default
 attributes, so these functions are not very useful, though they are required to
 to be present by
 .Tn POSIX .
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 14784b3..63b55ba 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -169,7 +169,8 @@ written by
 .An Bob Frey
 of Advanced System Products, Inc.
 Many thanks to AdvanSys for providing the original driver under a suitable
-license for use in FreeBSD.
+license for use in
+.Fx .
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index 76b4ce4..b32ab6d 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -81,7 +81,8 @@ from the Linux driver written by
 .An Bob Frey
 of Advanced System Products, Inc.
 Many thanks to AdvanSys for providing the original driver
-under a suitable license for use in FreeBSD.
+under a suitable license for use in
+.Fx .
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 047ab8365..9456fb3 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -73,7 +73,8 @@ The
 .Nm
 (Adaptec SCSI RAID)
 driver first appeared as the dpti2o driver under BSDi BSD/OS 3.2,
-then under FreeBSD 2.2.8
+then under
+.Fx 2.2.8
 and was ported over to the CAM layer represented in 4.0.
 .Sh AUTHORS
 The
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 6d17d6f..68f6b67 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -8,25 +8,27 @@
 .Nm bridge
 .Nd Bridging support
 .Sh DESCRIPTION
-Starting from version 2.2.8, FreeBSD supports bridging on ethernet-type
+Starting from version 2.2.8,
+.Fx
+supports bridging on ethernet-type
 interfaces.
 This is achieved using the following option
 .Bd -literal
     options BRIDGE
 .Ed
-
+.Pp
 in the kernel config file, and is controlled by two
 .Nm sysctl
 variables:
 .Bd -literal
     net.link.ether.bridge
 .Ed
-
+.Pp
 Set to 1 to enable bridging, set to 0 to disable it
 .Bd -literal
     net.link.ether.bridge_ipfw
 .Ed
-
+.Pp
 Set to 1 to enable
 .Nm ipfw
 filtering on bridged packets.
@@ -42,8 +44,6 @@ which must be an
 .Ar allow
 rule if we want ARP and other non-IP packets to flow through the
 bridge.
-
-
 .Sh BUGS
 .Pp
 Care must be taken not to construct loops in the bridge topology.
@@ -69,6 +69,7 @@ are not compatible with bridging.
 .Xr sysctl 8 .
 .Sh HISTORY
 .Nm
-bridging was introduced in FreeBSD 2.2.8
+bridging was introduced in
+.Fx 2.2.8
 by
 .An Luigi Rizzo Aq luigi@iet.unipi.it .
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 30c17d2..2692778 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -54,7 +54,9 @@ Any devices found which answer as 'Changer'
 type devices will be 'attached' to the 
 .Nm
 driver.
-In FreeBSD releases prior to 2.1, the first found will be attached as
+In
+.Fx
+releases prior to 2.1, the first found will be attached as
 .Em ch0
 and the next, 
 .Em ch1
@@ -63,8 +65,6 @@ Beginning in 2.1 it is possible to specify what ch unit a device should
 come on line as; refer to
 .Xr scsi 4
 for details on kernel configuration.
-.Pp
-
 .Sh KERNEL CONFIGURATION
 In configuring, if an optional
 .Ar count
@@ -73,7 +73,6 @@ are configured; Most storage for them is allocated only when found
 so a large number of configured devices is cheap.
 (once the first
 has included the driver).
-
 .Pp
 .Sh IOCTLS
 User mode programs communicate with the changer driver through a
@@ -167,8 +166,8 @@ u_int cp_npickers; /* number of pickers */
 u_int cp_nslots;   /* number of slots */
 u_int cp_nportals; /* number of import/export portals */
 u_int cp_ndrives;  /* number of drives */
-
 .Ed
+.Pp
 This call can be used by applications to query the dimensions of
 the jukebox before using the \fBCHIGSTATUS\fR
 ioctl to query the jukebox' status.
@@ -199,8 +198,8 @@ u_int                          cesr_element_base;
 u_int                          cesr_element_count;
 u_int                          cesr_flags;
 struct changer_element_status *cesr_element_status;
-
 .Ed
+.Pp
 This structure is read by the driver to determine the type, logical
 base address and number of elements for which information is to be
 returned in the array of changer_element_status structures pointed to
@@ -236,8 +235,8 @@ u_char           ces_idvalid;   /* ces_scsi_id is valid */
 u_char           ces_scsi_id;   /* SCSI id of element (if ces_idvalid is nonzero) */
 u_char           ces_lunvalid;  /* ces_scsi_lun is valid */
 u_char           ces_scsi_lun;  /* SCSI lun of elemtne (if ces_lunvalid is nonzero) */
-
 .Ed
+.Pp
 The ces_addr field contains the address of the element in the
 coordinate system of the media changer.  It is not used by the driver,
 and should be used for diagnostic purposes only.
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 66778d4..c989a3c 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -60,14 +60,14 @@ driver allows the disk to have two levels of partitioning.
 One layer, called the
 .Dq slice layer ,
 is used to separate the
-.Tn FreeBSD
+.Fx
 areas of the disk from areas used by other operating systems.
 The second layer is the native
 .Bx 4.4
 partitioning scheme,
 .Xr disklabel 5 ,
 which is used to subdivide the
-.Tn FreeBSD
+.Fx
 slices into areas for individual filesystems and swap spaces.
 For more information, see
 .Xr fdisk 8
@@ -77,10 +77,10 @@ respectively.
 .Pp
 If an uninitialized disk is opened, the slice table will be
 initialized with a fictitious
-.Tn FreeBSD
+.Fx
 slice spanning the entire disk.  Similarly, if an uninitialized
 (or
-.No non- Ns Tn FreeBSD )
+.No non- Ns Fx )
 slice is opened, its disklabel will be initialized with parameters returned
 by the drive and a single
 .Sq Li c
@@ -92,7 +92,7 @@ the caching control page.  Mode pages can be examined and modified
 via the
 .Xr camcontrol 8
 utility.
-
+.Pp
 The read cache is used to store data from device-initiated read ahead
 operations as well as frequently used data.  The read cache is transparent
 to the user and can be enabled without any adverse effect.  Most devices
@@ -100,7 +100,7 @@ with a read cache come from the factory with it enabled.  The read cache
 can be disabled by setting the
 .Tn RCD
 (Read Cache Disable) bit in the caching control mode page.
-
+.Pp
 The write cache can greatly decrease the latency of write operations
 and allows the device to reorganize writes to increase efficiency and
 performance.  This performance gain comes at a price.  Should the device
@@ -226,7 +226,7 @@ block mode
 disk unit
 .Ar u ,
 first
-.Tn FreeBSD
+.Fx
 slice, partition
 .Ar p
 .It Pa /dev/rda Ns Ar u Ns Ar p
@@ -235,7 +235,7 @@ raw mode
 disk unit
 .Ar u ,
 first
-.Tn FreeBSD
+.Fx
 slice, partition
 .Ar p
 .Sm off
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index 01e53c3..27967f7 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -28,7 +28,8 @@ Packets may also be written to a divert port, in which case they
 re-enter kernel IP packet processing.
 .Pp
 Divert sockets are normally used in conjunction with
-FreeBSD's packet filtering implementation and the
+.Fx Ns 's
+packet filtering implementation and the
 .Xr ipfw 8
 program.
 By reading from and writing to a divert socket, matching packets
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index e61e35f..133eac1 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -88,7 +88,7 @@ This flag disables the use of multiple
 transmit buffers and may be necessary in rare cases where packets are sent out
 faster than a machine on the other end can handle (as evidenced by severe packet
 lossage). Some
-.Pf ( No non- Ns Tn FreeBSD
+.No (non- Ns Fx
 :-)) machines have terrible ethernet performance
 and simply can't cope with 1100K+ data rates.
 Use of this flag also provides
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 97d8b55..6b434e7 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -15,7 +15,7 @@
 .Cd "device fpa"
 .Cd "device fea"
 .Pp
-.Tn FreeBSD
+.Fx
 only:
 .Cd "pseudo-device fddi"
 .Sh DESCRIPTION
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 04c4704..ed38f29 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -32,8 +32,9 @@
 .Nm kld
 .Nd dynamic kernel linker facility
 .Sh DESCRIPTION
-The LKM (Loadable Kernel Modules) facility has been deprecated in FreeBSD
-3.0 and above in favor of the 
+The LKM (Loadable Kernel Modules) facility has been deprecated in
+.Fx 3.0
+and above in favor of the 
 .Nm
 interface.
 This interface, like its
@@ -49,7 +50,7 @@ is a generic type, for which the module itself handles loading and
 unloading.
 .Pp
 The
-.Tn FreeBSD
+.Fx
 system makes extensive use of loadable kernel modules, and provides loadable
 versions of most filesystems, the
 .Tn NFS
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index 5fef67c..d46e134 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -76,7 +76,9 @@ The communication protocol is selected by the
 flag:
 .Bl -tag -width Fl
 .It Fl link0
-(default) Use FreeBSD mode (LPIP).  This is the simpler of the two modes
+(default) Use
+.Fx
+mode (LPIP).  This is the simpler of the two modes
 and therefore slightly more efficient.
 .It Cm link0
 Use Crynwr/Linux compatible mode (CLPIP).  This mode has a simulated ethernet
@@ -200,7 +202,9 @@ The length includes the 14 header bytes, but not the length bytes themselves
 nor the checksum byte.
 .Pp
 The checksum is a simple arithmetic sum of all the bytes (again, including
-the header but not checksum or length bytes).  FreeBSD calculates
+the header but not checksum or length bytes).
+.Fx
+calculates
 outgoing checksums, but does not validate incoming ones.
 .Pp
 The start of packet has to be signalled specially, since the line chosen
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index f6f6474..a39f837 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -47,7 +47,7 @@ HD64570 chip.
 Both the 2 and 4 port cards are supported and auto detected.
 .Pp
 The standard
-.Tn FreeBSD
+.Fx
 sppp code is used for the link level layer.
 The
 default protocol used is PPP.
diff --git a/share/man/man4/man4.i386/asr.4 b/share/man/man4/man4.i386/asr.4
index 047ab8365..9456fb3 100644
--- a/share/man/man4/man4.i386/asr.4
+++ b/share/man/man4/man4.i386/asr.4
@@ -73,7 +73,8 @@ The
 .Nm
 (Adaptec SCSI RAID)
 driver first appeared as the dpti2o driver under BSDi BSD/OS 3.2,
-then under FreeBSD 2.2.8
+then under
+.Fx 2.2.8
 and was ported over to the CAM layer represented in 4.0.
 .Sh AUTHORS
 The
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index 810c698..6bbd700 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -372,7 +372,7 @@ Source code and compilation options for
 
 The file \fIoptions.h\fR contains all of the compilation options.
 By default, the driver is configured to run on the current version of
-FreeBSD.  
+.Fx .
 .Sh NOTES
 .Pp
 The Creative/Panasonic interface does not use interrupts or DMA
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 2142f80..8adb5b7 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -37,7 +37,7 @@ The files required for Matrox Meteor card are:
 .br
 .in -0.5i
 For
-.Tn FreeBSD
+.Fx
 release versions 2.1 and earlier, the following patch files are also required:
 .br
 .in +0.5i
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 9970232..0cde09d 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -39,7 +39,9 @@
 .Sh SYNOPSIS
 .Cd controller pnp0
 .Sh DESCRIPTION
-Support for PnP devices in FreeBSD allows the user to override the
+Support for PnP devices in
+.Fx
+allows the user to override the
 configuration of PnP cards, and device drivers to fetch/modify
 parameters in the card's configuration space.
 .Pp
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 5958793..76860f6 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -48,7 +48,8 @@ For Yamaha OPL-2/OPL-3 FM support:
 .Sh DESCRIPTION
 This driver covers the SoundBlaster family of cards including the
 SoundBlaster 1.0 to the SoundBlaster 16/SoundBlaster 32.  The awe driver
-provides AWE32/64 functionality.  This driver is provided in FreeBSD
+provides AWE32/64 functionality.  This driver is provided in
+.Fx
 versions 2.0-current through 3.0-current.  You can also configure more
 then one card on a single DMA using the conflicts keyword in your
 configuration file.  This is useful for boards with more then one type of
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index 71c24f0..0d022bb 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -16,7 +16,7 @@ The speaker device driver allows applications to control the PC console
 speaker on an 
 .Tn IBM-PC Ns --compatible
 machine running
-.Tn FreeBSD .
+.Fx .
 .Pp
 Only one process may have this device open at any given time; 
 .Xr open 2
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 12a3e03..22c3dd9 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -48,7 +48,7 @@ driver supports the RISCom/N2 ISA cards and the WANic 400/405 PCI cards
 that is based on the HD64570 chip.
 .Pp
 The standard
-.Tn FreeBSD
+.Fx
 sppp code is used for the link level layer.
 The
 default protocol used is PPP.
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 7f9401c..ea78361 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -124,7 +124,9 @@ driver first appeared in
 .Fx 4.0
 as a cleaner replacement
 for the MFS functionality previously used in PicoBSD
-and in the FreeBSD installation process.
+and in the
+.Fx
+installation process.
 .Sh AUTHORS
 The
 .Nm
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 1b76cd1..585ce25 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -41,7 +41,7 @@
 .Sh NAME
 .Nm mtio
 .Nd
-.Tn FreeBSD
+.Fx
 magtape interface
 .Sh DESCRIPTION
 The special files
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 61a234e..c7f5c36 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -136,8 +136,9 @@ it is possible to scroll the screen back and forward.
 .Ss Configuration
 The
 .Nm pcvt
-console driver is available for the Intel-based FreeBSD operating
-system.
+console driver is available for the Intel-based
+.Fx
+operating system.
 It has been designed to be highly configurable in order to satisfy
 everyone's needs.
 The preferred way for those configurations is to
@@ -704,10 +705,21 @@ The
 driver has been developed for and contributed to 386BSD 0.1.
 Since then
 .Nm pcvt
-has become a standard part of FreeBSD, NetBSD and OpenBSD.
-Since FreeBSD 5.0,
+has become a standard part of
+.Fx ,
+.Nx
+and
+OpenBSD.
+Since
+.Fx 5.0 ,
 .Nm pcvt
-is FreeBSD specific with support for NetBSD and OpenBSD removed to
+is
+.Fx
+specific with support for
+.Nx
+and
+.Ox
+removed to
 ease further maintenance.
 .Sh AUTHORS
 Written by
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 81390b2..ac07927 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -292,7 +292,9 @@ driver.
 When this flag is set, the
 .Nm
 driver won't reset the pointing device when initializing the device.
-If the FreeBSD kernel
+If the
+.Fx
+kernel
 is started after another OS has run, the pointing device will inherit
 settings from the previous OS.
 However, because there is no way for the
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 6c68ca1..4e4fdc0 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -191,10 +191,14 @@ Many older
 devices may not work properly with this driver yet.
 .Pp
 Additionally, certain 
-tapes (QIC tapes mostly) that were written under FreeBSD 2.X
+tapes (QIC tapes mostly) that were written under
+.Fx
+2.X
 aren't automatically read correctly with this driver: you may need to
 explicitly set variable block mode or set to the blocksize that works best
-for your device in order to read tapes written under FreeBSD 2.X.
+for your device in order to read tapes written under
+.Fx
+2.X.
 .Pp
 Fine grained density and compression mode support that is bound to specific
 device names needs to be added.
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 168f50e..b0721d8 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -132,13 +132,15 @@ This may
 happen if the PCI BIOS not configured the device, which may be because
 the BIOS has been configured for a "Plug and Play" operating system.
 The "Plug and Play OS" setting int he BIOS should be set to "no" or
-"off" in order for PCI devices to work properly with FreeBSD.
+"off" in order for PCI devices to work properly with
+.Fx .
 .It "sf%d: couldn't map ports"
 A fatal initialization error has occurred.
 happen if the PCI BIOS not configured the device, which may be because
 the BIOS has been configured for a "Plug and Play" operating system.
 The "Plug and Play OS" setting int he BIOS should be set to "no" or
-"off" in order for PCI devices to work properly with FreeBSD.
+"off" in order for PCI devices to work properly with
+.Fx .
 .It "sf%d: couldn't map interrupt"
 A fatal initialization error has occurred.
 .It "sf%d: no memory for softc struct!"
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index a8bb878..9c649f7 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -88,7 +88,7 @@ Bit 7 is used to differentiate a tty/dialin port (bit 7=0) and a
 cua/callout port (bit 7=1).
 .Pp
 Bit 8 through 15 (on
-.Tn FreeBSD )
+.Fx )
 are unavailable as they are a shadow of the
 major device number.
 .Pp
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index 71c24f0..0d022bb 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -16,7 +16,7 @@ The speaker device driver allows applications to control the PC console
 speaker on an 
 .Tn IBM-PC Ns --compatible
 machine running
-.Tn FreeBSD .
+.Fx .
 .Pp
 Only one process may have this device open at any given time; 
 .Xr open 2
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index 2f98473..2208475 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -234,4 +234,4 @@ VMware
 .\" .Sh BUGS
 .Sh AUTHORS
 This man page has been obtained from
-.Bx Free .
+.Fx .
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 484dec6..69d06bd 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -200,7 +200,9 @@ version of
 includes the RAID-5 functionality.
 .Sh RUNNING VINUM
 .Nm
-is part of the base FreeBSD system.  It does not require installation.
+is part of the base
+.Fx
+system.  It does not require installation.
 To start it, start the
 .Nm vinum
 program, which will load the kld if it is not already present.
@@ -718,7 +720,9 @@ kernel and test with the kld module.
 Detection of differences between the version of the kernel and the kld is not
 yet implemented.
 .It
-The RAID-5 functionality is new in FreeBSD 3.3.  Some problems have been
+The RAID-5 functionality is new in
+.Fx 3.3 .
+Some problems have been
 reported with 
 .Nm
 in combination with soft updates, but these are not reproducible on all
@@ -1000,7 +1004,9 @@ If you have a panic, a stack trace as described above.
 .An Greg Lehey Aq grog@lemis.com .
 .Sh HISTORY
 .Nm vinum
-first appeared in FreeBSD 3.0.  The RAID-5 component of
+first appeared in
+.Fx 3.0 .
+The RAID-5 component of
 .Nm
 was developed by Cybernet Inc. 
 .Pa www.cybernet.com
diff --git a/share/man/man4/vn.4 b/share/man/man4/vn.4
index de343ab..7e26bf4 100644
--- a/share/man/man4/vn.4
+++ b/share/man/man4/vn.4
@@ -84,7 +84,9 @@ driver does not work if the file does not reside in a local filesystem.
 .Pp
 .Sh HISTORY
 The vnode disk driver was originally written at the University of
-Utah and was substantially modified by FreeBSD developers to add 
+Utah and was substantially modified by
+.Fx
+developers to add 
 swap-backed support.
 .Sh SEE ALSO
 .Xr config 8 ,
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 96f4a23..e81a974 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -50,9 +50,13 @@ Iomega Matchmaker Parallel to SCSI interface.
 The driver should let you use a printer connected to the drive while
 transfering data.
 .Pp
-DOS and FreeBSD filesystems are supported.
+DOS and
+.Fx
+filesystems are supported.
 When mounting a DOS filesystem or
-formating a FreeBSD filesystem, check the slice of the disk with the
+formating a
+.Fx
+filesystem, check the slice of the disk with the
 .Xr fdisk 8
 utility.
 .Pp
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index 8b285ff..8eb706d 100644
--- a/share/man/man4/worm.4
+++ b/share/man/man4/worm.4
@@ -45,10 +45,13 @@ None.
 .Sh DESCRIPTION
 The
 .Nm worm
-driver was provided under FreeBSD releases prior to
+driver was provided under
+.Fx
+releases prior to
 .Fx 3.0 .
 .Pp
-The FreeBSD
+The
+.Fx
 .Tn SCSI
 layer was replaced for
 .Fx 3.0
@@ -65,7 +68,9 @@ driver.  Users who wish
 to write CDs on a WORM, CD-R, or CD-RW drive
 should use
 .Nm cdrecord ,
-which is in the FreeBSD ports collection.
+which is in the
+.Fx
+ports collection.
 .Pp
 The
 .Xr cd 4 
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 0458840..7d4615b 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -97,7 +97,7 @@ called the
 The databases used to store the information are called
 .Em Tn NIS maps .
 In
-.Bx Free ,
+.Fx ,
 these maps are stored in
 .Pa /var/yp/[domainname]
 where
@@ -114,7 +114,7 @@ Each domain will have
 its own independent set of maps.
 .Pp
 In
-.Bx Free ,
+.Fx ,
 the
 .Tn NIS
 maps are Berkeley DB hashed database files (the
@@ -143,7 +143,7 @@ and
 .Pa passwd.byname.pag
 files on other operating systems (both of which are really parts of the
 same map),
-.Bx Free
+.Fx
 will have only one file called
 .Pa passwd.byname .
 The difference in format is not significant: only the
@@ -348,17 +348,17 @@ placing a slave server on the local network.)
 .El
 .Pp
 The
-.Bx Free
+.Fx
 .Xr ypserv 8
 is specially designed to provided enhanced security (compared to
 other
 .Tn NIS
 implementations) when used exclusively with
-.Bx Free
+.Fx
 client
 systems.
 The
-.Bx Free
+.Fx
 password database system (which is derived directly
 from
 .Bx 4.4 )
@@ -375,7 +375,7 @@ is allowed to retrieve
 data.
 .Pp
 To help prevent this,
-.Bx Free Ns 's
+.Fx Ns 's
 .Tn NIS
 server handles the shadow password maps
 .Pf ( Pa master.passwd.byname
@@ -389,7 +389,7 @@ users.
 All other requests are denied: requests from non-privileged
 ports will receive only an error code from the server.
 Additionally,
-.Bx Free Ns 's
+.Fx Ns 's
 .Xr ypserv 8
 includes support for Wietse Venema's tcp wrapper package; with tcp
 wrapper support enabled, the administrator can configure
@@ -404,7 +404,7 @@ someone with access to your network to spoof the server into disclosing
 the shadow password maps.
 .Pp
 On the client side,
-.Bx Free Ns 's
+.Fx Ns 's
 .Fn getpwent 3
 functions will automatically search for the
 .Pa master.passwd
@@ -416,9 +416,12 @@ If they aren't found, the standard
 .Pa passwd
 maps will be used instead.
 .Sh COMPATIBILITY
-When using a non-FreeBSD NIS server for
+When using a
+.No non- Ns Fx
+NIS server for
 .Xr passwd 5
-files, it is unlikely that the default MD5-based format that FreeBSD
+files, it is unlikely that the default MD5-based format that
+.Fx
 uses for passwords will be accepted by it.
 If this is the case, the value of the "passwd_format" setting in
 .Xr login.conf 5
@@ -441,7 +444,7 @@ a host that doesn't exist in its
 or
 .Pa hosts.byaddr
 maps.
-.Bx Free Ns 's
+.Fx Ns 's
 resolver uses
 .Tn DNS
 by default (it can be made to use
@@ -463,14 +466,14 @@ It can also be made to register itself as an
 v1 server
 in order to placate certain systems that insist on the presence of
 a v1 server 
-.Pf ( Bx Free
+.No ( Fx
 uses only
 .Tn NIS
 v2, but many other systems,
 including 
 .Tn SunOS
 4.x, search for both a v1 and v2 server when binding).
-.Bx Free Ns 's
+.Fx Ns 's
 .Xr ypserv 8
 does not actually handle
 .Tn NIS
@@ -484,7 +487,7 @@ manual page for a detailed description of these special features
 and flags.)
 .Sh BUGS
 While
-.Bx Free
+.Fx
 now has both
 .Tn NIS
 client and server capabilities, it does not yet have support for
@@ -495,7 +498,7 @@ function.
 Both of these require secure
 .Tn RPC Ns ,
 which
-.Bx Free
+.Fx
 doesn't
 support yet either.
 .Pp
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 5937308..0b287e1 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -74,7 +74,9 @@ by the processes PID, and
 .Em \&%U
 by the UID.  The name defaults to
 .Em \&%N.core ,
-yielding the traditional FreeBSD behaviour.
+yielding the traditional
+.Fx
+behaviour.
 .Pp
 The core file consists of the
 .Fa u .
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index fe3ad28..ab81b22 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -150,7 +150,8 @@ struct dirent {
 .Xr fs 5 ,
 .Xr inode 5
 .Sh BUGS
-The usage of the member d_type of struct dirent is unportable as it is FreeBSD-specific.
+The usage of the member d_type of struct dirent is unportable as it is
+.Fx Ns -specific .
 It also may fail on certain filesystems, for example the cd9660 filesystem.
 .Sh HISTORY
 A
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 5df3e04..3be41df 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -129,7 +129,9 @@ Longer lines will be skipped.
 This limitation disappeared in
 .Fx 3.0 .
 Older binaries that are statically linked, depend on old
-shared libraries, or non-FreeBSD binaries in compatibility mode
+shared libraries, or
+.No non- Ns Fx
+binaries in compatibility mode
 may still have this limits.
 .Sh FILES
 .Bl -tag -width /etc/group -compact
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index d683aa0..aa4f4e3 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -508,7 +508,7 @@ On SunOS systems, this field contains an open file descriptor to
 .Dq Pa /dev/zero
 used to get demand paged zeroed pages.
 On
-.Tn FreeBSD
+.Fx
 systems it contains -1.
 .It Fa crt_ldfd
 Contains an open file descriptor that was used by crt0 to load
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 7729de0..537713c 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -56,7 +56,9 @@ Initial settings for
 .Xr sysctl 8 .
 .Sh EXAMPLES
 To turn off logging of programs that exit due to fatal signals, as well as
-telling Linux programs that you are running FreeBSD 3.4-STABLE, you may use
+telling Linux programs that you are running
+.Fx
+3.4-STABLE, you may use
 a configuration like
 .Bd -literal -offset indent
 # Configure logging and Linux execution.
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index 864e347..3082636 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -59,7 +59,7 @@ Note that
 may be floating point.  Don't use 
 .Fn clock
 in new programs under
-.Tn FreeBSD .
+.Fx .
 It is feeble compared with
 .Xr getrusage 2 .
 It is provided for ANSI conformance.  It is implemented by calling
@@ -80,7 +80,7 @@ Note that its frequency may be different from
 Don't use 
 .Xr times 3
 in new programs under
-.Tn FreeBSD .
+.Fx .
 It is feeble compared with
 .Xr gettimeofday 2
 together with 
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 5880fdc..73d3b6f 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -335,7 +335,7 @@ see
 .It Li local/
 local executables, libraries, etc.
 Also used as the default destination for the
-.Tn FreeBSD
+.Fx
 ports framework.
 Within local/, the general layout sketched out by
 .Xr hier 7
@@ -346,7 +346,7 @@ rather than under local/share/.  Ports documentation is in share/doc/<port>/
 architecture-specific target tree produced by building the /usr/src tree
 .It Li ports
 The
-.Tn FreeBSD
+.Fx
 ports collection (optional).
 .It Li sbin/
 system daemons & system utilities (executed by users)
@@ -390,7 +390,7 @@ association)
 .It Li FAQ/
 Frequently Asked Questions
 .It Li handbook/
-.Tn FreeBSD
+.Fx
 Handbook
 .It Li papers/
 UNIX Papers
@@ -519,7 +519,7 @@ src for files in /usr/lib
 src for files in /usr/libexec
 .It Li release/
 files required to produce a
-.Tn FreeBSD 
+.Fx 
 release
 .It Li sbin/
 src for files in /sbin
@@ -530,7 +530,8 @@ src for files in /usr/share
 .It Li sys/
 kernel src files
 .It Li tools/
-tools used for maintenance and testing of FreeBSD
+tools used for maintenance and testing of
+.Fx
 .It Li usr.bin/
 src for files in /usr/bin
 .It Li usr.sbin/
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index a55d0e7..0e48665 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -533,7 +533,7 @@ and if it is specified,
 the volume title may be omitted.
 .Pp
 Under
-.Tn FreeBSD ,
+.Fx ,
 the following section numbers and their descriptions are described below:
 .Pp
 .Bl -column SMM -offset indent -compact
@@ -579,7 +579,7 @@ The name of the operating system
 should be the common acronym, e.g.
 .Tn BSD
 or
-.Tn FreeBSD
+.Fx
 or
 .Tn ATT .
 The release should be the standard release
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 9a6f09f..d9c1359 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -33,7 +33,8 @@
 .Nd contributed applications
 .Sh DESCRIPTION
 The
-.Nm FreeBSD Ports Collection
+.Fx
+.Nm Ports Collection
 offers a simple way for users and
 administrators to install applications.
 Each 
@@ -51,7 +52,9 @@ simply type
 .Ic make install
 to install the application.
 .Pp
-It is possible to download and use ports from the FreeBSD repository
+It is possible to download and use ports from the
+.Fx
+repository
 that are newer than the installed system; however it is important to
 install the appropriate "Upgrade Kit" from http://www.FreeBSD.org/ports/
 first!  The
@@ -66,7 +69,9 @@ For information about creating new ports, see
 .Nm Porting applications
 (file:/usr/share/doc/handbook/porting.html --or--
 http://www.FreeBSD.org/handbook/porting.html).
-Both are part of the FreeBSD Handbook.
+Both are part of the
+.Fx
+Handbook.
 .Pp
 .Sh TARGETS
 .Pp
@@ -188,11 +193,9 @@ You can change all of these.
 Location of the ports tree.  This is
 .Pa /usr/ports
 on
-.\" .Fx
-FreeBSD
+.Fx
 and
-.\" .Ox ,
-OpenBSD
+.Ox
 and
 .Pa /usr/pkgsrc
 on
@@ -236,7 +239,9 @@ Primary sites for distribution files if not found locally.
 Primary location(s) for distribution patch files if not found
 locally.
 .It Ev MASTER_SITE_FREEBSD
-If set, go to the master FreeBSD site for all files.
+If set, go to the master
+.Fx
+site for all files.
 .It Ev MASTER_SITE_OVERRIDE
 Try going to this site for all files and patches, first.
 .It Ev NOCLEANDEPENDS
@@ -258,7 +263,12 @@ If defined, only operate on a port if it can be installed 100% automatically.
 .Sh FILES
 .Bl -tag -width /usr/ports/xxxx -compact
 .It Pa /usr/ports
-The default ports directory (FreeBSD and OpenBSD).
+The default ports directory
+.Po
+.Fx
+and
+.Ox
+.Pc .
 .It Pa /usr/pkgsrc
 The default ports directory (NetBSD).
 .It Pa /usr/ports/Mk/bsd.port.mk
@@ -277,7 +287,9 @@ The following are part of the ports collection:
 .Xr portcheckout 1 ,
 .Xr portlint 1
 .Pp
-The FreeBSD handbook
+The
+.Fx
+handbook
 .Pp
 http://www.FreeBSD.org/ports
 .Pq searchable index of all ports
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 8b68423..6fc1a10 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -42,7 +42,7 @@
 .Sh NAME
 .Nm crash
 .Nd 
-.Tn FreeBSD
+.Fx
 system failures
 .Sh DESCRIPTION
 This section explains a bit about system crashes
@@ -202,7 +202,7 @@ If the core image is the result of a panic,
 the panic message is printed.
 For more details consult the chapter on kernel debugging in
 the
-.Tn FreeBSD
+.Fx
 handbook (http://www.FreeBSD.org).
 .Sh SEE ALSO
 .Xr gdb 1 ,
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 422c3a8..3f2795a 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -8,7 +8,9 @@
 .Nd Floppy disk based FreeBSD system
 .Sh SYNOPSIS
 .Nm
-is a minimal implementation of FreeBSD on one or more floppy disks.  The
+is a minimal implementation of
+.Fx
+on one or more floppy disks.  The
 floppies are required for loading only; the system runs from ramdisk and is thus
 not limited to the speed of the floppies.
 .Sh DESCRIPTION
@@ -30,7 +32,9 @@ prompts for additional floppies and reads them in to the MFS file system.
 .Sh ENVIRONMENT
 As a result of the extreme size limitations, the
 .Nm 
-environment differs from the normal FreeBSD in a number of ways:
+environment differs from the normal
+.Fx
+in a number of ways:
 .Bl -bullet
 .It
 There are no dynamic libraries, and there is no directory
@@ -181,7 +185,9 @@ dynamic libraries, so the programs must be static.
 To boot
 .Nm PicoBSD ,
 insert the floppy and reset the machine.  The boot procedure is similar to the
-standard FreeBSD boot, but proceeds at a snail's pace.  From the end of the POST
+standard
+.Fx
+boot, but proceeds at a snail's pace.  From the end of the POST
 (BIOS Power On Self Test) until the prompt for the second floppy takes about 3
 minutes.
 .Pp
@@ -260,7 +266,9 @@ floppies, and the only practical method is trial and error.
 .Pp
 The original version of 
 .Nm
-fits on one floppy.  Since FreeBSD 4.0, the kernel is so large that most
+fits on one floppy.  Since
+.Fx 4.0 ,
+the kernel is so large that most
 configurations will need a second floppy to do any productive work.
 Nevertheless, it should be possible to create minimal kernels which will fit
 alongside sufficient other programs on a single floppy.
@@ -269,8 +277,9 @@ The approach of building executables with
 .Xr crunchgen 1
 means that considerable duplication of libraries occurs between the floppies.
 .Pp
-At the current time (December 1999), the old-style build is broken in FreeBSD
--CURRENT.  In view of the significant increase in size of the 4.x kernel
+At the current time (December 1999), the old-style build is broken in
+.Fx Ns -CURRENT .
+In view of the significant increase in size of the 4.x kernel
 compared to the 3.x kernel, it is not certain that it can be fixed.
 .Pp
 .Nm
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 0458840..7d4615b 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -97,7 +97,7 @@ called the
 The databases used to store the information are called
 .Em Tn NIS maps .
 In
-.Bx Free ,
+.Fx ,
 these maps are stored in
 .Pa /var/yp/[domainname]
 where
@@ -114,7 +114,7 @@ Each domain will have
 its own independent set of maps.
 .Pp
 In
-.Bx Free ,
+.Fx ,
 the
 .Tn NIS
 maps are Berkeley DB hashed database files (the
@@ -143,7 +143,7 @@ and
 .Pa passwd.byname.pag
 files on other operating systems (both of which are really parts of the
 same map),
-.Bx Free
+.Fx
 will have only one file called
 .Pa passwd.byname .
 The difference in format is not significant: only the
@@ -348,17 +348,17 @@ placing a slave server on the local network.)
 .El
 .Pp
 The
-.Bx Free
+.Fx
 .Xr ypserv 8
 is specially designed to provided enhanced security (compared to
 other
 .Tn NIS
 implementations) when used exclusively with
-.Bx Free
+.Fx
 client
 systems.
 The
-.Bx Free
+.Fx
 password database system (which is derived directly
 from
 .Bx 4.4 )
@@ -375,7 +375,7 @@ is allowed to retrieve
 data.
 .Pp
 To help prevent this,
-.Bx Free Ns 's
+.Fx Ns 's
 .Tn NIS
 server handles the shadow password maps
 .Pf ( Pa master.passwd.byname
@@ -389,7 +389,7 @@ users.
 All other requests are denied: requests from non-privileged
 ports will receive only an error code from the server.
 Additionally,
-.Bx Free Ns 's
+.Fx Ns 's
 .Xr ypserv 8
 includes support for Wietse Venema's tcp wrapper package; with tcp
 wrapper support enabled, the administrator can configure
@@ -404,7 +404,7 @@ someone with access to your network to spoof the server into disclosing
 the shadow password maps.
 .Pp
 On the client side,
-.Bx Free Ns 's
+.Fx Ns 's
 .Fn getpwent 3
 functions will automatically search for the
 .Pa master.passwd
@@ -416,9 +416,12 @@ If they aren't found, the standard
 .Pa passwd
 maps will be used instead.
 .Sh COMPATIBILITY
-When using a non-FreeBSD NIS server for
+When using a
+.No non- Ns Fx
+NIS server for
 .Xr passwd 5
-files, it is unlikely that the default MD5-based format that FreeBSD
+files, it is unlikely that the default MD5-based format that
+.Fx
 uses for passwords will be accepted by it.
 If this is the case, the value of the "passwd_format" setting in
 .Xr login.conf 5
@@ -441,7 +444,7 @@ a host that doesn't exist in its
 or
 .Pa hosts.byaddr
 maps.
-.Bx Free Ns 's
+.Fx Ns 's
 resolver uses
 .Tn DNS
 by default (it can be made to use
@@ -463,14 +466,14 @@ It can also be made to register itself as an
 v1 server
 in order to placate certain systems that insist on the presence of
 a v1 server 
-.Pf ( Bx Free
+.No ( Fx
 uses only
 .Tn NIS
 v2, but many other systems,
 including 
 .Tn SunOS
 4.x, search for both a v1 and v2 server when binding).
-.Bx Free Ns 's
+.Fx Ns 's
 .Xr ypserv 8
 does not actually handle
 .Tn NIS
@@ -484,7 +487,7 @@ manual page for a detailed description of these special features
 and flags.)
 .Sh BUGS
 While
-.Bx Free
+.Fx
 now has both
 .Tn NIS
 client and server capabilities, it does not yet have support for
@@ -495,7 +498,7 @@ function.
 Both of these require secure
 .Tn RPC Ns ,
 which
-.Bx Free
+.Fx
 doesn't
 support yet either.
 .Pp
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 4fba880..ba2fdec 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -116,7 +116,7 @@ Each system's heuristics for picking the correct time are slightly
 different.
 .Pp
 The
-.Tn FreeBSD
+.Fx
 implementation should do a better job of validating the time provided in
 .Fa base 
 when the battery-backed clock is unusable.  Currently it unconditionally
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index 3a02d73..fb3a6b8 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -68,7 +68,9 @@ appear.
 .Sh PROPERLY HIDING EXTENSIONS
 The following test macros are set up in <sys/_posix.h>.  They should
 used by system header files to avoid the kind of tests you see in
-<sys/_posix.h>.  Source programs should not use these FreeBSD specific
+<sys/_posix.h>.  Source programs should not use these
+.Fx
+specific
 implementation details and should test _POSIX_VERSION, _POSIX_SOURCE
 and _POSIX_C_SOURCE.
 These should not be used in the kernel though - the kernel should be
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index f401a14..b463e73 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -191,7 +191,7 @@ Unix.  They have been traditionally known by number instead of by
 names, and were inclusive up to higher priority levels (i.e., priority
 5 has been blocking everything up to level 5).  This is no longer the
 case in
-.Tn FreeBSD .
+.Fx .
 The traditional name
 .Ql level
 for them is still reflected in the letter
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index fcf1a07..07f128e 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -32,7 +32,7 @@
 .Nd "Kernel source file style guide"
 .Sh DESCRIPTION
 This file specifies the preferred style for kernel source files in the
-.Tn FreeBSD
+.Fx
 source tree.  It is also a guide for preferred userland code style.
 .Bd -literal -offset 0i
 /*
@@ -562,5 +562,5 @@ the
 .Tn BSD 
 4.4-Lite2 release, with updates to reflect the current practice and
 desire of the
-.Tn FreeBSD
+.Fx
 project.
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index dffb25c..8f7db5d 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -179,11 +179,21 @@ same manner as
 .Fn timeout .
 .Sh HISTORY
 The current timeout and untimeout routines are based on the work of
-Adam M. Costello and George Varghese, published in a technical report entitled
+.An Adam M. Costello
+and
+.An George Varghese ,
+published in a technical report entitled
 .%T "Redesigning the BSD Callout and Timer Facilities"
-and modified slightly for inclusion in FreeBSD by Justin T. Gibbs.
+and modified slightly for inclusion in
+.Fx
+by
+.An Justin T. Gibbs .
 The original work on the data structures used in this implementation
-was published by G.Varghese and A. Lauck in the paper
+was published by
+.An G. Varghese
+and
+.An A. Lauck
+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" .