Use Fx macro wherever possible.

143 files changed, 572 insertions, 310 deletions

diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index de70ab6..58d5f44 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -138,7 +138,9 @@ will run with effective gid set to the gid of the file owner.
 (the sticky bit)  
 When set on a directory, unprivileged users can delete and rename
 only those files in the directory that are owned by them, regardless of 
-the permissions on the directory.  Under FreeBSD, the sticky bit is 
+the permissions on the directory.  Under
+.Fx ,
+the sticky bit is 
 ignored for executable files and may only be set for directories (see 
 .Xr sticky 8 ).
 .It Li 0400
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 96e4f07..7829238 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -60,6 +60,6 @@ convenience.
 The
 .Nm 
 command appeared in
-.Tn FreeBSD
+.Fx
 1.1, based on a similar command in
 .Tn SunOS .
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index 0677640..6abb548 100644
--- a/contrib/pnpinfo/pnpinfo.8
+++ b/contrib/pnpinfo/pnpinfo.8
@@ -51,7 +51,7 @@ A few of the tags are unimplemented (Enough exist for 99% of PnP cards).
 The
 .Nm
 utility first appeared in
-.Tn FreeBSD
+.Fx
 2.2.
 .Sh AUTHOR
 .Bl -tag
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 74d4b2c..fea2f98 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -206,7 +206,8 @@ Specifies the name of the output file. Defaults to
 .It Fl Q
 Produce a
 .Dv QMAGIC
-(FreeBSD/BSDi-i386) output file.  This is the default.
+.Pq Fx Ns / Ns Tn BSDi Ns -i386
+output file.  This is the default.
 .It Fl r
 Produce relocatable object file, suitable for another pass through
 .Nm ld.
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index 4ae542a..3ead49e 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -433,7 +433,7 @@ source]
 and innumerable others who have contributed fixes and additions.
 .Pp
 Man page obtained by the
-.Bx Free
+.Fx
 group from the NetBSD 1.0 release.
 .Sh BUGS
 The
diff --git a/lib/libc/gen/dllockinit.3 b/lib/libc/gen/dllockinit.3
index 93fce2b..0e97857 100644
--- a/lib/libc/gen/dllockinit.3
+++ b/lib/libc/gen/dllockinit.3
@@ -111,4 +111,5 @@ with all arguments
 .Sh HISTORY
 The
 .Nm
-function first appeared in FreeBSD 4.0.
+function first appeared in
+.Fx 4.0 .
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index 39a4340..ce01a4c 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -198,7 +198,7 @@ is set in
 .Sh BUGS
 .Tn NetBSD
 and
-.Tn FreeBSD
+.Fx
 do not define the
 .Er EIDRM
 error value, which should be used in
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index e022ec0..1feb94b 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.3
@@ -161,7 +161,7 @@ The system call was interrupted by the delivery of a signal.
 .Sh BUGS
 .Tn NetBSD
 and
-.Tn FreeBSD
+.Fx
 do not define the
 .Er EIDRM
 error value, which should be used
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index b6d385d..17dfb9e 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -58,7 +58,7 @@ System call restart has been the default behavior since
 and is the default behaviour for
 .Xr signal 3
 on
-.Tn FreeBSD .
+.Fx .
 .Pp
 If the flag is true (1),
 then restarting of system calls is disabled.
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 4435573..2c108d1 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -46,8 +46,10 @@
 .\" fix it.
 .Ft void \*(lp*
 .Fn signal "int sig" "void \*(lp*func\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint"
-
-or in FreeBSD's equivalent but easier to read typedef'd version:
+.Pp
+or in
+.Fx Ns 's
+equivalent but easier to read typedef'd version:
 .Ft typedef "void \*(lp*sig_t\*(rp \*(lpint\*(rp"
 .Ft sig_t
 .Fn signal "int sig" "sig_t func"
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index aac38e7..bfbd95f 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -53,7 +53,9 @@ they are not portable.
 
 POSIX.1e describes a set of ACL manipulation routines to manage the
 contents of ACLs, as well as their relationships with files.  This
-manipulation library is not currently implemented in FreeBSD, although
+manipulation library is not currently implemented in
+.Fx ,
+although
 a third party library was under development at the time this document
 was written.  There is a general consensus that the POSIX.1e manipulation
 routines are ambiguously defined in the specification, and don't meet the
@@ -140,7 +142,8 @@ The syscalls between the internal interfaces and the public library
 routines may change over time, and as such are not documented.  They are
 not intended to be called directly without going through the library.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh ENVIRONMENT
 POSIX.1e assigns security labels to all objects, extending the security
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index 24ffc23..3d68c5e 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -57,7 +57,8 @@ directory) by name; the other two calls are non-portable extensions that
 allow deleting of arbitrary ACL types from a file/directory by either path
 name, or by file descriptor.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 In the event of success, 0 is returned.  In the event of failure, -1 is
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index 890a93c..107fc3f 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -55,7 +55,8 @@ Any existing ACL pointers that refer to the ACL referred to by
 .Va acl
 shall continue to refer to the ACL.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, this function shall return a pointer to the
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
index 1b0da80..c593e57 100644
--- a/lib/libc/posix1e/acl_free.3
+++ b/lib/libc/posix1e/acl_free.3
@@ -46,7 +46,8 @@ call allows the freeing of ACL working space, such as is allocated by
 or
 .Xr acl_from_text 3 .
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 In the event of success, 0 is returned.  In the event of failure, -1 is
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index c860128..adfbe79 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -53,7 +53,8 @@ with the
 .Va (void *)acl_t
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index 2459902..10acebb 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -76,7 +76,8 @@ with the object referred to by
 The ACL in the working storage shall not participate in any access control
 decisions.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the ACL
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index c1c9c15..8cf78ed 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -57,7 +57,8 @@ with the
 .Va (void*)acl_t
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, this function shall return a pointer to the
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
index ec60157..85fe872 100644
--- a/lib/libc/posix1e/acl_set.3
+++ b/lib/libc/posix1e/acl_set.3
@@ -63,7 +63,8 @@ where as
 .Fn acl_set_fd_np
 allows the setting of ACLs of any type.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a value of zero.
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index 6f9ba11..3902653 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -60,7 +60,8 @@ with the
 .Va (void*)char
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the
@@ -99,7 +100,9 @@ by the hardware or software-imposed memory management constraints.
 .Sh STANDARDS
 POSIX.1e is described in IEEE POSIX.1e draft 17.  Discussion
 of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.  To join this list, see the FreeBSD POSIX.1e implementation
+mailing list.  To join this list, see the
+.Fx
+POSIX.1e implementation
 page for more information.
 .Sh HISTORY
 POSIX.1e support was introduced in
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index 1a909ac..ea1cf68 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -80,7 +80,8 @@ The POSIX.1e
 function may reorder the ACL for the purposes of verification; the
 non-portable validation functions will not.  
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a value of zero.
@@ -132,7 +133,9 @@ The file system does not support ACL retrieval.
 .Sh STANDARDS
 POSIX.1e is described in IEEE POSIX.1e draft 17.  Discussion
 of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.  To join this list, see the FreeBSD POSIX.1e implementation
+mailing list.  To join this list, see the
+.Fx
+POSIX.1e implementation
 page for more information.
 .Sh HISTORY
 POSIX.1e support was introduced in
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index a8e84e4..3581c97 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -41,19 +41,24 @@
 .Sh DESCRIPTION
 The IEEE POSIX.1e specification never left draft form, but the interfaces
 it describes are now widely used despite inherent limitations.  Currently,
-only a few of the interfaces and features are implemented in FreeBSD,
+only a few of the interfaces and features are implemented in
+.Fx ,
 although efforts are underway to complete the integration at this time.
 
 POSIX.1e describes five security extensions to the base POSIX.1 API:
 Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access
 Control, and Information Flow Labels.  Of these, the ACL interfaces are
-currently included with FreeBSD, Auditing, Capabilities, and Mandatory
+currently included with
+.Fx ,
+Auditing, Capabilities, and Mandatory
 Access Control are in the wings, and Information Flow Labels are not on
 the calendar.
 
 POSIX.1e defines both syntax and semantics for these features, but fairly
 substantial changes are required to implement these features in the 
-operating system.  As shipped, FreeBSD 4.0 permits file systems to export
+operating system.  As shipped,
+.Fx 4.0
+permits file systems to export
 Access Control Lists via the VFS, and provides a library for userland
 access to and manipulation of these ACLs, but support for ACLs is not
 provided by any file systems shipped in the base operating system.
@@ -72,7 +77,8 @@ TrustedBSD project:
 http://www.trustedbsd.org
 
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh ENVIRONMENT
 POSIX.1e assigns security labels to all objects, extending the security
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 16cec8b..26ff25d 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -81,7 +81,9 @@ or
 does not handle NULL arguments; they will result in a segmentation
 violation.
 This is intentional - it makes it easier to make sure programs written
-under FreeBSD are bug free.
+under
+.Fx
+are bug free.
 This behaviour is an implementation detail, and programs should not
 rely upon it.
 .Sh SEE ALSO
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index f6d1209..4753dfb 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -150,7 +150,9 @@ assigning a differently sized
 .Ar value
 to the same
 .Ar name
-will result in a memory leak.  The FreeBSD semantics for these functions
+will result in a memory leak.  The
+.Fx
+semantics for these functions
 (namely, that the contents of
 .Ar value
 are copied and that old values remain accessible indefinitely) make this
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 4f6b9ef..03feaa3 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -123,7 +123,8 @@ The
 .Fn reallocf
 function call is identical to the realloc function call, except that it
 will free the passed pointer when the requested memory cannot be allocated.
-This is a FreeBSD
+This is a
+.Fx
 specific API designed to ease the problems with traditional coding styles
 for realloc causing memory leaks in libraries.
 .Pp
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index f0fcbf4..0e586d5 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -121,7 +121,9 @@ completed.
 .Sh STANDARDS
 The
 .Fn aio_waitcomplete
-function is a FreeBSD-specific extension.
+function is a
+.Fx Ns -specific
+extension.
 .Sh HISTORY
 The
 .Fn aio_waitcomplete
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index b02fec0..ab9455d 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -282,14 +282,14 @@ of slightly less than 2G, 4GB, 6GB and 8GB.
 The limit is imposed for a variety of reasons.
 Most of them have to do
 with
-.Tn FreeBSD
+.Fx
 not wanting to use 64 bit offsets in the VM system due to
 the extreme performance penalty.
 So
-.Tn FreeBSD
+.Fx
 uses 32bit page indexes and
 this gives
-.Tn FreeBSD
+.Fx
 a maximum of 8TB filesizes.
 It's actually bugs in
 the filesystem code that causes the limit to be further restricted to
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 837dde5..e3e1169 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -78,7 +78,7 @@ and data, which is why there are two requests: conceptually,
 reads from the instruction space and
 .Dv PT_READ_D
 reads from the data space.  In the current
-.Tn FreeBSD
+.Fx
 implementation, these
 two requests are completely identical.  The
 .Fa addr
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index ec53699..471d244 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -152,7 +152,8 @@ There is insufficient swap space for the new process.
 .Xr vfork 2 ,
 .Xr rfork_thread 3
 .Sh BUGS
-FreeBSD does not yet implement a native
+.Fx
+does not yet implement a native
 .Fn clone
 library call, and the current pthreads implementation does not use
 .Fn
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index a451ee8..5619891 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -99,7 +99,9 @@ and the error
 .Er EAGAIN
 is returned.
 .Sh IMPLEMENTATION NOTES
-The FreeBSD implementation of
+The
+.Fx
+implementation of
 .Fn sendfile
 is "zero-copy", meaning that it has been optimized so that copying of the file data is avoided.
 .Pp
diff --git a/lib/libc_r/man/pthread_condattr.3 b/lib/libc_r/man/pthread_condattr.3
index 9aa9a52..6b8a983 100644
--- a/lib/libc_r/man/pthread_condattr.3
+++ b/lib/libc_r/man/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/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index d6f707a..f4ad6e4 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -162,7 +162,8 @@ migration path for userland
 .Tn SCSI
 applications written with the similarly-named
 .Va scsireq_ Ns *
-functions from the old FreeBSD
+functions from the old
+.Fx
 .Tn SCSI
 layer.
 .Pp
@@ -503,7 +504,8 @@ return the number of assignments performed.
 .Sh HISTORY
 .Pp
 The CAM versions of these functions are based upon similar functions
-implemented for the old FreeBSD
+implemented for the old
+.Fx
 .Tn SCSI
 layer.  The encoding/decoding functions in the old
 .Tn SCSI
@@ -522,7 +524,8 @@ 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
-led to the original FreeBSD
+led to the original
+.Fx
 .Tn SCSI
 library and the related kernel ioctl.
 If anyone needs that for compatibility contact dufault@hda.com.
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index eca3dd7..2105a81 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -238,7 +238,9 @@ are experimental, do not use.
 creates a chunk with the specified parameters.
 .Pp
 .Fn All_FreeBSD
-makes one FreeBSD chunk covering the entire disk; if
+makes one
+.Fx
+chunk covering the entire disk; if
 .Ql force_all
 is set, bypass all BIOS geometry considerations.
 .Pp
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 704836d..ff2bd8b 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -520,7 +520,9 @@ library was mostly written by
 with numerous suggestions from
 .An Jordan K. Hubbard Aq jkh@FreeBSD.org ,
 .An Eugene Skepner Aq eu@qub.com
-and other FreeBSD developers.
+and other
+.Fx
+developers.
 It replaces the older
 .Nm ftpio
 library written by
diff --git a/lib/libposix1e/acl.3 b/lib/libposix1e/acl.3
index aac38e7..bfbd95f 100644
--- a/lib/libposix1e/acl.3
+++ b/lib/libposix1e/acl.3
@@ -53,7 +53,9 @@ they are not portable.
 
 POSIX.1e describes a set of ACL manipulation routines to manage the
 contents of ACLs, as well as their relationships with files.  This
-manipulation library is not currently implemented in FreeBSD, although
+manipulation library is not currently implemented in
+.Fx ,
+although
 a third party library was under development at the time this document
 was written.  There is a general consensus that the POSIX.1e manipulation
 routines are ambiguously defined in the specification, and don't meet the
@@ -140,7 +142,8 @@ The syscalls between the internal interfaces and the public library
 routines may change over time, and as such are not documented.  They are
 not intended to be called directly without going through the library.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh ENVIRONMENT
 POSIX.1e assigns security labels to all objects, extending the security
diff --git a/lib/libposix1e/acl_delete.3 b/lib/libposix1e/acl_delete.3
index 24ffc23..3d68c5e 100644
--- a/lib/libposix1e/acl_delete.3
+++ b/lib/libposix1e/acl_delete.3
@@ -57,7 +57,8 @@ directory) by name; the other two calls are non-portable extensions that
 allow deleting of arbitrary ACL types from a file/directory by either path
 name, or by file descriptor.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 In the event of success, 0 is returned.  In the event of failure, -1 is
diff --git a/lib/libposix1e/acl_dup.3 b/lib/libposix1e/acl_dup.3
index 890a93c..107fc3f 100644
--- a/lib/libposix1e/acl_dup.3
+++ b/lib/libposix1e/acl_dup.3
@@ -55,7 +55,8 @@ Any existing ACL pointers that refer to the ACL referred to by
 .Va acl
 shall continue to refer to the ACL.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, this function shall return a pointer to the
diff --git a/lib/libposix1e/acl_free.3 b/lib/libposix1e/acl_free.3
index 1b0da80..c593e57 100644
--- a/lib/libposix1e/acl_free.3
+++ b/lib/libposix1e/acl_free.3
@@ -46,7 +46,8 @@ call allows the freeing of ACL working space, such as is allocated by
 or
 .Xr acl_from_text 3 .
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 In the event of success, 0 is returned.  In the event of failure, -1 is
diff --git a/lib/libposix1e/acl_from_text.3 b/lib/libposix1e/acl_from_text.3
index c860128..adfbe79 100644
--- a/lib/libposix1e/acl_from_text.3
+++ b/lib/libposix1e/acl_from_text.3
@@ -53,7 +53,8 @@ with the
 .Va (void *)acl_t
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the
diff --git a/lib/libposix1e/acl_get.3 b/lib/libposix1e/acl_get.3
index 2459902..10acebb 100644
--- a/lib/libposix1e/acl_get.3
+++ b/lib/libposix1e/acl_get.3
@@ -76,7 +76,8 @@ with the object referred to by
 The ACL in the working storage shall not participate in any access control
 decisions.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the ACL
diff --git a/lib/libposix1e/acl_init.3 b/lib/libposix1e/acl_init.3
index c1c9c15..8cf78ed 100644
--- a/lib/libposix1e/acl_init.3
+++ b/lib/libposix1e/acl_init.3
@@ -57,7 +57,8 @@ with the
 .Va (void*)acl_t
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, this function shall return a pointer to the
diff --git a/lib/libposix1e/acl_set.3 b/lib/libposix1e/acl_set.3
index ec60157..85fe872 100644
--- a/lib/libposix1e/acl_set.3
+++ b/lib/libposix1e/acl_set.3
@@ -63,7 +63,8 @@ where as
 .Fn acl_set_fd_np
 allows the setting of ACLs of any type.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a value of zero.
diff --git a/lib/libposix1e/acl_to_text.3 b/lib/libposix1e/acl_to_text.3
index 6f9ba11..3902653 100644
--- a/lib/libposix1e/acl_to_text.3
+++ b/lib/libposix1e/acl_to_text.3
@@ -60,7 +60,8 @@ with the
 .Va (void*)char
 as an argument.
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a pointer to the
@@ -99,7 +100,9 @@ by the hardware or software-imposed memory management constraints.
 .Sh STANDARDS
 POSIX.1e is described in IEEE POSIX.1e draft 17.  Discussion
 of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.  To join this list, see the FreeBSD POSIX.1e implementation
+mailing list.  To join this list, see the
+.Fx
+POSIX.1e implementation
 page for more information.
 .Sh HISTORY
 POSIX.1e support was introduced in
diff --git a/lib/libposix1e/acl_valid.3 b/lib/libposix1e/acl_valid.3
index 1a909ac..ea1cf68 100644
--- a/lib/libposix1e/acl_valid.3
+++ b/lib/libposix1e/acl_valid.3
@@ -80,7 +80,8 @@ The POSIX.1e
 function may reorder the ACL for the purposes of verification; the
 non-portable validation functions will not.  
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh RETURN VALUES
 Upon successful completion, the function shall return a value of zero.
@@ -132,7 +133,9 @@ The file system does not support ACL retrieval.
 .Sh STANDARDS
 POSIX.1e is described in IEEE POSIX.1e draft 17.  Discussion
 of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.  To join this list, see the FreeBSD POSIX.1e implementation
+mailing list.  To join this list, see the
+.Fx
+POSIX.1e implementation
 page for more information.
 .Sh HISTORY
 POSIX.1e support was introduced in
diff --git a/lib/libposix1e/posix1e.3 b/lib/libposix1e/posix1e.3
index a8e84e4..3581c97 100644
--- a/lib/libposix1e/posix1e.3
+++ b/lib/libposix1e/posix1e.3
@@ -41,19 +41,24 @@
 .Sh DESCRIPTION
 The IEEE POSIX.1e specification never left draft form, but the interfaces
 it describes are now widely used despite inherent limitations.  Currently,
-only a few of the interfaces and features are implemented in FreeBSD,
+only a few of the interfaces and features are implemented in
+.Fx ,
 although efforts are underway to complete the integration at this time.
 
 POSIX.1e describes five security extensions to the base POSIX.1 API:
 Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access
 Control, and Information Flow Labels.  Of these, the ACL interfaces are
-currently included with FreeBSD, Auditing, Capabilities, and Mandatory
+currently included with
+.Fx ,
+Auditing, Capabilities, and Mandatory
 Access Control are in the wings, and Information Flow Labels are not on
 the calendar.
 
 POSIX.1e defines both syntax and semantics for these features, but fairly
 substantial changes are required to implement these features in the 
-operating system.  As shipped, FreeBSD 4.0 permits file systems to export
+operating system.  As shipped,
+.Fx 4.0
+permits file systems to export
 Access Control Lists via the VFS, and provides a library for userland
 access to and manipulation of these ACLs, but support for ACLs is not
 provided by any file systems shipped in the base operating system.
@@ -72,7 +77,8 @@ TrustedBSD project:
 http://www.trustedbsd.org
 
 .Sh IMPLEMENTATION NOTES
-FreeBSD's support for POSIX.1e interfaces and features is still under
+.Fx Ns 's
+support for POSIX.1e interfaces and features is still under
 development at this time.
 .Sh ENVIRONMENT
 POSIX.1e assigns security labels to all objects, extending the security
diff --git a/lib/libpthread/man/pthread_condattr.3 b/lib/libpthread/man/pthread_condattr.3
index 9aa9a52..6b8a983 100644
--- a/lib/libpthread/man/pthread_condattr.3
+++ b/lib/libpthread/man/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/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index cd06e7e..f8b48e2 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -382,6 +382,8 @@ without recording an error message.
 .Sh AUTHORS
 This software was originally written by
 .An John Polstra ,
-and donated to the FreeBSD project by Juniper Networks, Inc.
+and donated to the
+.Fx
+project by Juniper Networks, Inc.
 Oleg Semyonov subsequently added the ability to perform RADIUS
 accounting.
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index f05f1b7..1f6ab0a 100644
--- a/lib/libradius/radius.conf.5
+++ b/lib/libradius/radius.conf.5
@@ -164,4 +164,6 @@ auth  192.168.27.81  $X*#..38947ax-+=
 .Sh AUTHORS
 This documentation was written by
 .An John Polstra ,
-and donated to the FreeBSD project by Juniper Networks, Inc.
+and donated to the
+.Fx
+project by Juniper Networks, Inc.
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 0934747..c960771 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -345,4 +345,6 @@ without recording an error message.
 .Sh AUTHORS
 This software was written by
 .An John Polstra ,
-and donated to the FreeBSD project by Juniper Networks, Inc.
+and donated to the
+.Fx
+project by Juniper Networks, Inc.
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index 4cb2772..315c0657 100644
--- a/lib/libtacplus/tacplus.conf.5
+++ b/lib/libtacplus/tacplus.conf.5
@@ -111,4 +111,6 @@ auth.domain.com:4333	"Don't tell!!"	15	single-connection
 .Sh AUTHORS
 This documentation was written by
 .An John Polstra ,
-and donated to the FreeBSD project by Juniper Networks, Inc.
+and donated to the
+.Fx
+project by Juniper Networks, Inc.
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 0ccfafd..7009416 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -48,7 +48,9 @@ non-root user without a valid login class in
 A user with a uid of 0 without a valid login class will use the record
 "root" if it exists, or "default" if not.
 .Pp
-In FreeBSD, users may individually create a file called
+In
+.Fx ,
+users may individually create a file called
 .Pa .login_conf
 in their home directory using the same format, consisting of a single
 entry with a record id of "me".
@@ -205,7 +207,9 @@ ensure octal interpretation.
 .It passwd_format	string	md5	The encryption format that new or
 changed passwords will use.
 Valid values include "md5" and "des".
-NIS clients using a non-FreeBSD NIS server should probably use "des".
+NIS clients using a
+.No non- Ns Fx
+NIS server should probably use "des".
 .\" .It approve	program 	Program to approve login.
 .It mixpasswordcase	bool	true	Whether
 .Xr passwd 1
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index a3e3d99..f517576 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -104,7 +104,7 @@ found. The netid database is not likely to be present on most systems
 until
 .Tn Secure RPC
 support is added to
-.Bx Free .
+.Fx .
 .It Fl d Ar domain
 By default, the
 .Nm
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 9ce6633..ce34130 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -180,7 +180,7 @@ protocol is not compatible with
 Sun's, therefore it will not work with Sun's ypxfrd server.
 .Fx
 slave systems can still transfer maps from any
-.No non- Ns Tn FreeBSD
+.No non- Ns Fx
 .Tn NIS
 server,
 however they will only be able to take advantage of the faster protocol
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 48b89fe..15a99e2 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -47,7 +47,7 @@ file system.
 The main purpose of this thing is not general fixing of
 initially broken MS-DOS file timestamp idea but keeping
 the same timestamps between
-.Bx Free
+.Fx
 MS-DOS file system
 and MS-DOS operating system installed on the same
 machine.
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 3b9e139..13aa183 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -221,13 +221,17 @@ itself must be provided as the canonical name, i.e. not as a full
 path name.
 .Pp
 PC-based systems have special requirements in order for the BIOS to properly
-recognize a FreeBSD disklabel.  Older systems may require what is known as a
+recognize a
+.Fx
+disklabel.  Older systems may require what is known as a
 .Dq dangerously dedicated
 disklabel, which creates a fake DOS partition to work around problems older
 BIOSes have with modern disk geometries.  On newer systems you generally want
 to create a normal DOS slice using
 .Ar fdisk
-and then create a FreeBSD disklabel within that slice.  This is described
+and then create a
+.Fx
+disklabel within that slice.  This is described
 later on in this page.
 .Pp
 Installing a new disklabel does not in of itself allow your system to boot
@@ -303,7 +307,9 @@ the slice name such as
 .Pa da0s1 .
 Making a partition bootable can be tricky.  If you are using a normal DOS
 slice you typically install (or leave) a standard MBR on the base disk and
-then install the FreeBSD bootblocks in the slice.
+then install the
+.Fx
+bootblocks in the slice.
 .Pp
 .Nm disklabel
 .Fl B
@@ -403,17 +409,25 @@ on architectures like the Alpha, where only a single-stage boot is used).
 .Pp
 To initialize a disk from scratch the following sequence is recommended.
 Please note that this will wipe everything that was previously on the disk,
-including any non-FreeBSD slices.
+including any
+.No non- Ns Fx
+slices.
 .Bl -enum
 .It
 Use
 .Ar fdisk
 to initialize the DOS partition table, creating a real whole-disk slice to
-hold the FreeBSD disklabel, and installing a master boot record.
+hold the
+.Fx
+disklabel, and installing a master boot record.
 .It
 Use
 .Ar disklabel
-to initialize a virgin FreeBSD disklabel and install FreeBSD boot blocks .
+to initialize a virgin
+.Fx
+disklabel and install
+.Fx
+boot blocks.
 .It
 Use
 .Ar disklabel
@@ -507,7 +521,9 @@ Flags may be
 or
 .Ar badsect .
 .Ar removable
-is set for removable media drives, but no current FreeBSD driver evaluates this
+is set for removable media drives, but no current
+.Fx
+driver evaluates this
 flag.
 .Ar ecc
 is no longer supported; 
@@ -559,7 +575,9 @@ Display the in-core label for
 .Pa da0s1
 as obtained via
 .Pa /dev/da0s1 .
-When reading a label, FreeBSD will allow you to specify the base disk name
+When reading a label,
+.Fx
+will allow you to specify the base disk name
 even if the label resides on a slice.  However, to be proper you should
 specify the base disk name only if you are using a
 .Dq dangerously-dedicated
diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8
index 066c4e9..5b6d7cb 100644
--- a/sbin/cxconfig/cxconfig.8
+++ b/sbin/cxconfig/cxconfig.8
@@ -277,7 +277,7 @@ Frame address registers for address recognition.
 .El
 .Sh EXAMPLES
 Set up the channel 7 of the adapter Sigma-400 under
-.Bx Free .
+.Fx .
 Physical 4-wire leased line with Zelax+ M115 short-range modems.
 Synchronous mode, 128000 bits/sec, interface RS-232,
 protocol PpP/HDLC without keepalive support, NRZI encoding,
@@ -288,7 +288,7 @@ ifconfig cx7 158.250.244.2 158.250.244.1 up
 .Ed
 .Pp
 Set up the channel 0 of the adapter Sigma-100 under
-.Bx Free .
+.Fx .
 Attachment to the near computer by short cable, internal clock source.
 Synchronous mode, 256000 bits/sec, interface RS-232,
 protocol Cisco/HDLC with keepalive support:
@@ -306,7 +306,7 @@ ifconfig cx1 193.124.254.50 193.124.254.49 multicast up
 .Ed
 .Pp
 Set up the channel 0 of the adapter Sigma-840 under
-.Bx Free .
+.Fx .
 Attachment to the Cisco-4000 router by null-modem cable, internal clock source.
 Synchronous mode, 64000 bits/sec, interface RS-232,
 protocol PpP/HDLC with keepalive support and flow control,
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 3b9e139..13aa183 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -221,13 +221,17 @@ itself must be provided as the canonical name, i.e. not as a full
 path name.
 .Pp
 PC-based systems have special requirements in order for the BIOS to properly
-recognize a FreeBSD disklabel.  Older systems may require what is known as a
+recognize a
+.Fx
+disklabel.  Older systems may require what is known as a
 .Dq dangerously dedicated
 disklabel, which creates a fake DOS partition to work around problems older
 BIOSes have with modern disk geometries.  On newer systems you generally want
 to create a normal DOS slice using
 .Ar fdisk
-and then create a FreeBSD disklabel within that slice.  This is described
+and then create a
+.Fx
+disklabel within that slice.  This is described
 later on in this page.
 .Pp
 Installing a new disklabel does not in of itself allow your system to boot
@@ -303,7 +307,9 @@ the slice name such as
 .Pa da0s1 .
 Making a partition bootable can be tricky.  If you are using a normal DOS
 slice you typically install (or leave) a standard MBR on the base disk and
-then install the FreeBSD bootblocks in the slice.
+then install the
+.Fx
+bootblocks in the slice.
 .Pp
 .Nm disklabel
 .Fl B
@@ -403,17 +409,25 @@ on architectures like the Alpha, where only a single-stage boot is used).
 .Pp
 To initialize a disk from scratch the following sequence is recommended.
 Please note that this will wipe everything that was previously on the disk,
-including any non-FreeBSD slices.
+including any
+.No non- Ns Fx
+slices.
 .Bl -enum
 .It
 Use
 .Ar fdisk
 to initialize the DOS partition table, creating a real whole-disk slice to
-hold the FreeBSD disklabel, and installing a master boot record.
+hold the
+.Fx
+disklabel, and installing a master boot record.
 .It
 Use
 .Ar disklabel
-to initialize a virgin FreeBSD disklabel and install FreeBSD boot blocks .
+to initialize a virgin
+.Fx
+disklabel and install
+.Fx
+boot blocks.
 .It
 Use
 .Ar disklabel
@@ -507,7 +521,9 @@ Flags may be
 or
 .Ar badsect .
 .Ar removable
-is set for removable media drives, but no current FreeBSD driver evaluates this
+is set for removable media drives, but no current
+.Fx
+driver evaluates this
 flag.
 .Ar ecc
 is no longer supported; 
@@ -559,7 +575,9 @@ Display the in-core label for
 .Pa da0s1
 as obtained via
 .Pa /dev/da0s1 .
-When reading a label, FreeBSD will allow you to specify the base disk name
+When reading a label,
+.Fx
+will allow you to specify the base disk name
 even if the label resides on a slice.  However, to be proper you should
 specify the base disk name only if you are using a
 .Dq dangerously-dedicated
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 71b01c8..68cc63e 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -40,7 +40,7 @@ program can be used to divide space on the disk into partitions and set one
 .Em active .
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 serves a similar purpose to the DOS program.  The first form is used to
@@ -171,7 +171,7 @@ The second partition overlaps the end of the first.
 .Bl -tag -width "cyl, sector and head"
 .It Em "sysid"
 is used to label the partition.
-.Bx Free
+.Fx
 reserves the
 magic number 165 decimal (A5 in hex).
 .It Em "start and size"
@@ -244,7 +244,7 @@ While the
 .Fl i
 flag is used to "initialize" sector 0;
 it will setup the last BIOS partition to use the whole disk for
-.Bx Free ;
+.Fx ;
 and make it active.
 .Sh NOTES
 The automatic calculation of starting cylinder etc. uses
@@ -257,7 +257,7 @@ that use geometry translation under the BIOS.
 .Pp
 If you hand craft your disk layout,
 please make sure that the
-.Bx Free
+.Fx
 partition starts on a cylinder boundary.
 A number of decisions made later may assume this.
 (This might not be necessary later.)
@@ -324,7 +324,7 @@ It is an error if the following is not true:
 .Pp
 The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be output.  Note that bootable
-.Bx Free
+.Fx
 partitions (the "/" filesystem) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable partitions do not have this restriction.
@@ -368,7 +368,7 @@ if one is present.
 The
 .Ar type
 is 165 for
-.Bx Free
+.Fx
 partitions.  Specifying a partition type of zero is
 the same as clearing the partition and marking it as unused; however,
 dummy values (such as "0") must still be specified for
@@ -386,7 +386,7 @@ p       4       0       0       0
 .Ed
 .Pp
 Example: to set partition 1 to a
-.Bx Free
+.Fx
 partition, starting at sector 1
 for 2503871 sectors (note: these numbers will be rounded upwards and
 downwards to correspond to head and cylinder boundaries):
@@ -429,7 +429,7 @@ is used where it should actually be
 in order to conform with the terms used elsewhere.
 .Pp
 You cannot use this command to completely dedicate a disk to
-.Bx Free .
+.Fx .
 The
 .Xr disklabel 8
 command must be used for this.
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index fcc4eb5..0f48fa6 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -41,7 +41,7 @@ program can be used to divide space on the disk into partitions and set one
 .Em active .
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 serves a similar purpose to the DOS program.  The first form is used to
@@ -197,7 +197,7 @@ The second partition overlaps the end of the first.
 .Bl -tag -width "cyl, sector and head"
 .It Em "sysmid"
 is used to label the partition.
-.Bx Free
+.Fx
 reserves the
 magic number 148 decimal (94 in hex).
 .It Em "start and size"
@@ -272,7 +272,7 @@ While the
 .Fl i
 flag is used to "initialize" sector 0;
 it will setup the last BIOS partition to use the whole disk for
-.Bx Free ;
+.Fx ;
 and make it active.
 .Sh NOTES
 The automatic calculation of starting cylinder etc. uses
@@ -285,7 +285,7 @@ that use geometry translation under the BIOS.
 .Pp
 If you hand craft your disk layout,
 please make sure that the
-.Bx Free
+.Fx
 partition starts on a cylinder boundary.
 A number of decisions made later may assume this.
 (This might not be necessary later.)
@@ -352,7 +352,7 @@ It is an error if the following is not true:
 .Pp
 The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be output.  Note that bootable
-.Bx Free
+.Fx
 partitions (the "/" filesystem) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable partitions do not have this restriction.
@@ -396,7 +396,7 @@ if one is present.
 The
 .Ar type
 is 165 for
-.Bx Free
+.Fx
 partitions.  Specifying a partition type of zero is
 the same as clearing the partition and marking it as unused; however,
 dummy values (such as "0") must still be specified for
@@ -414,7 +414,7 @@ p       4       0       0       0
 .Ed
 .Pp
 Example: to set partition 1 to a
-.Bx Free
+.Fx
 partition, starting at sector 1
 for 2503871 sectors (note: these numbers will be rounded upwards and
 downwards to correspond to head and cylinder boundaries):
@@ -455,7 +455,7 @@ is used where it should actually be
 in order to conform with the terms used elsewhere.
 .Pp
 You cannot use this command to completely dedicate a disk to
-.Bx Free .
+.Fx .
 The
 .Xr disklabel 8
 command must be used for this.
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 066c4e9..5b6d7cb 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -277,7 +277,7 @@ Frame address registers for address recognition.
 .El
 .Sh EXAMPLES
 Set up the channel 7 of the adapter Sigma-400 under
-.Bx Free .
+.Fx .
 Physical 4-wire leased line with Zelax+ M115 short-range modems.
 Synchronous mode, 128000 bits/sec, interface RS-232,
 protocol PpP/HDLC without keepalive support, NRZI encoding,
@@ -288,7 +288,7 @@ ifconfig cx7 158.250.244.2 158.250.244.1 up
 .Ed
 .Pp
 Set up the channel 0 of the adapter Sigma-100 under
-.Bx Free .
+.Fx .
 Attachment to the near computer by short cable, internal clock source.
 Synchronous mode, 256000 bits/sec, interface RS-232,
 protocol Cisco/HDLC with keepalive support:
@@ -306,7 +306,7 @@ ifconfig cx1 193.124.254.50 193.124.254.49 multicast up
 .Ed
 .Pp
 Set up the channel 0 of the adapter Sigma-840 under
-.Bx Free .
+.Fx .
 Attachment to the Cisco-4000 router by null-modem cable, internal clock source.
 Synchronous mode, 64000 bits/sec, interface RS-232,
 protocol PpP/HDLC with keepalive support and flow control,
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 71b01c8..68cc63e 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -40,7 +40,7 @@ program can be used to divide space on the disk into partitions and set one
 .Em active .
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 serves a similar purpose to the DOS program.  The first form is used to
@@ -171,7 +171,7 @@ The second partition overlaps the end of the first.
 .Bl -tag -width "cyl, sector and head"
 .It Em "sysid"
 is used to label the partition.
-.Bx Free
+.Fx
 reserves the
 magic number 165 decimal (A5 in hex).
 .It Em "start and size"
@@ -244,7 +244,7 @@ While the
 .Fl i
 flag is used to "initialize" sector 0;
 it will setup the last BIOS partition to use the whole disk for
-.Bx Free ;
+.Fx ;
 and make it active.
 .Sh NOTES
 The automatic calculation of starting cylinder etc. uses
@@ -257,7 +257,7 @@ that use geometry translation under the BIOS.
 .Pp
 If you hand craft your disk layout,
 please make sure that the
-.Bx Free
+.Fx
 partition starts on a cylinder boundary.
 A number of decisions made later may assume this.
 (This might not be necessary later.)
@@ -324,7 +324,7 @@ It is an error if the following is not true:
 .Pp
 The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be output.  Note that bootable
-.Bx Free
+.Fx
 partitions (the "/" filesystem) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable partitions do not have this restriction.
@@ -368,7 +368,7 @@ if one is present.
 The
 .Ar type
 is 165 for
-.Bx Free
+.Fx
 partitions.  Specifying a partition type of zero is
 the same as clearing the partition and marking it as unused; however,
 dummy values (such as "0") must still be specified for
@@ -386,7 +386,7 @@ p       4       0       0       0
 .Ed
 .Pp
 Example: to set partition 1 to a
-.Bx Free
+.Fx
 partition, starting at sector 1
 for 2503871 sectors (note: these numbers will be rounded upwards and
 downwards to correspond to head and cylinder boundaries):
@@ -429,7 +429,7 @@ is used where it should actually be
 in order to conform with the terms used elsewhere.
 .Pp
 You cannot use this command to completely dedicate a disk to
-.Bx Free .
+.Fx .
 The
 .Xr disklabel 8
 command must be used for this.
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index bd73481..5796c36 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -15,7 +15,7 @@
 .Ar filename
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 controls the actions of the boot blocks at the time of the next boot.
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 775f5d4..ae77842 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -188,7 +188,8 @@ or
 A
 .Nm
 utility first appeared in SunOS 4.0, it appeared in its current form
-in FreeBSD 1.1.
+in
+.Fx 1.1 .
 .Sh BUGS
 Some security checks (for example, verifying root ownership of
 added directories) are not performed when
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index f45272e..3537dd1 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -92,7 +92,8 @@ It is strongly recomended to mount readonly!
 .Sh HISTORY
 The
 .Nm
-first appered in FreeBSD 3.0
+first appered in
+.Fx 3.0 .
 .Sh AUTHOR
 HPFS kernel implementation,
 .Nm
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index 08a4804..d23d01c 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -209,4 +209,5 @@ The
 .Nm
 command first appeared in
 .Bx 4.4 .
-It first worked in FreeBSD-(fill this in).
+It first worked in
+.Fx Ns -(fill this in) .
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 08a4804..d23d01c 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -209,4 +209,5 @@ The
 .Nm
 command first appeared in
 .Bx 4.4 .
-It first worked in FreeBSD-(fill this in).
+It first worked in
+.Fx Ns -(fill this in) .
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index bd73481..5796c36 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -15,7 +15,7 @@
 .Ar filename
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 controls the actions of the boot blocks at the time of the next boot.
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index fcc4eb5..0f48fa6 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -41,7 +41,7 @@ program can be used to divide space on the disk into partitions and set one
 .Em active .
 .Sh DESCRIPTION
 The
-.Bx Free
+.Fx
 program
 .Nm
 serves a similar purpose to the DOS program.  The first form is used to
@@ -197,7 +197,7 @@ The second partition overlaps the end of the first.
 .Bl -tag -width "cyl, sector and head"
 .It Em "sysmid"
 is used to label the partition.
-.Bx Free
+.Fx
 reserves the
 magic number 148 decimal (94 in hex).
 .It Em "start and size"
@@ -272,7 +272,7 @@ While the
 .Fl i
 flag is used to "initialize" sector 0;
 it will setup the last BIOS partition to use the whole disk for
-.Bx Free ;
+.Fx ;
 and make it active.
 .Sh NOTES
 The automatic calculation of starting cylinder etc. uses
@@ -285,7 +285,7 @@ that use geometry translation under the BIOS.
 .Pp
 If you hand craft your disk layout,
 please make sure that the
-.Bx Free
+.Fx
 partition starts on a cylinder boundary.
 A number of decisions made later may assume this.
 (This might not be necessary later.)
@@ -352,7 +352,7 @@ It is an error if the following is not true:
 .Pp
 The number of cylinders should be less than or equal to 1024, but this
 is not enforced, although a warning will be output.  Note that bootable
-.Bx Free
+.Fx
 partitions (the "/" filesystem) must lie completely within the
 first 1024 cylinders; if this is not true, booting may fail.
 Non-bootable partitions do not have this restriction.
@@ -396,7 +396,7 @@ if one is present.
 The
 .Ar type
 is 165 for
-.Bx Free
+.Fx
 partitions.  Specifying a partition type of zero is
 the same as clearing the partition and marking it as unused; however,
 dummy values (such as "0") must still be specified for
@@ -414,7 +414,7 @@ p       4       0       0       0
 .Ed
 .Pp
 Example: to set partition 1 to a
-.Bx Free
+.Fx
 partition, starting at sector 1
 for 2503871 sectors (note: these numbers will be rounded upwards and
 downwards to correspond to head and cylinder boundaries):
@@ -455,7 +455,7 @@ is used where it should actually be
 in order to conform with the terms used elsewhere.
 .Pp
 You cannot use this command to completely dedicate a disk to
-.Bx Free .
+.Fx .
 The
 .Xr disklabel 8
 command must be used for this.
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 87d008d..09e5714 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -2306,14 +2306,18 @@ performance.  In particular, most systems use far too small a stripe size.  The
 following discussion applies to all RAID systems, not just to
 .Nm vinum .
 .Pp
-The FreeBSD block I/O system issues requests of between .5kB and 60 kB; a
+The
+.Fx
+block I/O system issues requests of between .5kB and 60 kB; a
 typical mix is somewhere round 8 kB.  You can't stop any striping system from
 breaking a request into two physical requests, and if you do it wrong it can be
 broken into several.  This will result in a significant drop in performance: the
 decrease in transfer time per disk is offset by the order of magnitude greater
 increase in latency.
 .Pp
-With modern disk sizes and the FreeBSD I/O system, you can expect to have a
+With modern disk sizes and the
+.Fx
+I/O system, you can expect to have a
 reasonably small number of fragmented requests with a stripe size between 256 kB
 and 512 kB; with correct RAID implementations there is no obvious reason not to
 increase the size to 2 or 4 MB on a large disk.
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" .
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 0c885c0..2e1f6cf 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -35,7 +35,9 @@
 .Sh DESCRIPTION
 The program called
 .Nm
-is the final stage of FreeBSD's kernel bootstrapping process.
+is the final stage of
+.Fx Ns 's
+kernel bootstrapping process.
 On IA32 (i386) architectures, it is a
 .Pa BTX
 client.
diff --git a/sys/modules/ibcs2/ibcs2.8 b/sys/modules/ibcs2/ibcs2.8
index be34bd8..34880c7 100644
--- a/sys/modules/ibcs2/ibcs2.8
+++ b/sys/modules/ibcs2/ibcs2.8
@@ -42,7 +42,9 @@ utility loads kernel runtime support for iBCS2 compliant programs.
 This runtime support is limited to emulation of the iBCS2
 system call interface, and is far from complete. COFF binaries
 and shared libraries are supported, however no shared libraries
-are provided with the FreeBSD distribution.
+are provided with the
+.Fx
+distribution.
 .Sh FILES
 .Bl -tag -width /usr/share/examples/ibcs2/* -compact
 .It Pa /modules/ibcs2.ko
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index c8d058e..75407e3 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -41,7 +41,7 @@
 .Ar
 .Sh DESCRIPTION
 This command marks an ELF binary to be run under a certain ABI for
-.Tn FreeBSD .
+.Fx .
 .Pp
 The options are as follows:
 .Bl -tag -width Fl
@@ -60,7 +60,7 @@ Brands the given ELF binaries to be of the
 .Ar string
 ABI type.
 Currently supported ABIs are
-.Dq Tn FreeBSD ,
+.Dq Fx ,
 .Dq Tn Linux ,
 and
 .Dq Tn SVR4 .
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index d142d35..f0d120d 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -715,7 +715,9 @@ Quit doscmd.
 You know have a bootable pseudo disk which will automatically call
 the magic 
 .Li redir
-program, which installs FreeBSD disks.  To use
+program, which installs
+.Fx
+disks.  To use
 them add lines to your .doscmdrc such as:
 .Bd -literal -offset indent
 assign D: /usr/dos
diff --git a/usr.bin/genassym/genassym.8 b/usr.bin/genassym/genassym.8
index 60a3b83..5f2bb41 100644
--- a/usr.bin/genassym/genassym.8
+++ b/usr.bin/genassym/genassym.8
@@ -18,7 +18,9 @@ command is a special-purpose program to generate assembler
 symbols from C code and is used to interface the low-level
 assembly code with the C code.
 This, for example, is used
-to build a FreeBSD kernel or module.
+to build a
+.Fx
+kernel or module.
 Its
 .Ar objfile
 argument is the name of an ELF object file that holds the
@@ -70,4 +72,5 @@ is 32 bits.
 .Sh HISTORY
 The
 .Nm
-command first appeared in FreeBSD 4.0.
+command first appeared in
+.Fx 4.0 .
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 8aa62e9..de95f6a 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -242,7 +242,9 @@ The current
 .Nm
 implementation understand databases in host byte order or
 network byte order if both architectures use the same integer size. 
-So you can read on a FreeBSD/i386 machine 
+So you can read on a
+.Fx Ns /i386
+machine 
 (little endian)
 a locate database which was built on SunOS/sparc machine
 (big endian, net).
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index d57cf98..177baf5 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -55,7 +55,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl t
 Set the modification time of the __.SYMDEF file.
-Some loaders (but not the FreeBSD one)
+Some loaders (but not the
+.Fx
+one)
 compared this time with the modification time of the
 archive to verify that the table is up-to-date with respect to the
 archive.
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index f57529a..6e8d7ba 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -42,7 +42,8 @@
 .Op Fl t Ar ticks
 .Ar disk
 .Sh DESCRIPTION
-The FreeBSD
+The
+.Fx
 .Sq boot0
 boot manager permits the operator to select from which disk and which
 slice an i386 machine (PC) is booted.
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 7a126e0..8d4692e 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -108,7 +108,8 @@ subdirectory of the system source (usually
 .Pa /sys/ARCH/conf ) ,
 where
 .Pa ARCH
-represents one of the architectures supported by FreeBSD.
+represents one of the architectures supported by
+.Fx .
 .Nm Config
 creates the directory
 .Pa ../../compile/SYSTEM_NAME
@@ -173,7 +174,9 @@ provides very little support for normal kernels, and a debug kernel is needed
 for any meaningful analysis.
 .Pp
 For reasons of history, time and space, building a debug kernel is not the
-default with FreeBSD: a debug kernel takes up to 30% longer to build and
+default with
+.Fx :
+a debug kernel takes up to 30% longer to build and
 requires about 30 MB of disk storage in the build directory, compared to about 6
 MB for a non-debug kernel.  A debug kernel is about 11 MB in size, compared to
 about 2 MB for a non-debug kernel.  This space is used both in the root file
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 836ea7c..a873c50 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -59,7 +59,9 @@ optionally call
 to apply it to the source tree.
 At the moment,
 several source trees are distributed, and by several sites.  These include
-the FreeBSD-current source and CVS trees, distributed by
+the
+.Fx Ns -current
+source and CVS trees, distributed by
 .Li freefall.FreeBSD.org .
 .Pp
 Command line arguments for
@@ -361,7 +363,9 @@ which allows
 .Nm ctm_rmail
 to execute
 .Xr ctm
-on the (non-FreeBSD) machine that this example was taken from.
+on the
+.Pq non- Ns Fx
+machine that this example was taken from.
 .Sh SECURITY
 .Pp
 On its own, CTM is an insecure protocol
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index ded267f..584737c 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -48,7 +48,9 @@ is possible.
 The driver is just a glue layer between Serge Vakulenko's sppp 
 backend and the ISDN4BSD package.
 .Pp
-Beginning with i4b version 0.95 (and only for FreeBSD), the sppp 
+Beginning with i4b version 0.95 (and only for
+.Fx ) ,
+the sppp 
 subsystem was integrated into the
 .Nm
 driver to support more i4b/ISDN specific options. As a consequence it is no
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 7cbbabd..9072204 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -279,7 +279,9 @@ Just add the following line to sysctl.conf:
 jail.set_hostname_allowed=0
 .Ed
 .Pp
-In a future version of FreeBSD, the mechanisms for managing jails will be
+In a future version of
+.Fx ,
+the mechanisms for managing jails will be
 more refined.
 .Ss Sysctl MIB Entries
 Certain aspects of the jail containments environment may be modified from
@@ -354,7 +356,8 @@ The jail feature was written by
 .An Poul-Henning Kamp
 for R&D Associates
 .Dq Li http://www.rndassociates.com/
-who contributed it to FreeBSD.
+who contributed it to
+.Fx .
 .Pp
 Robert Watson wrote the extended documentation, found a few bugs, added
 a few new features, and cleaned up the userland jail environment.
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 0174d90..0f47cda 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -43,7 +43,8 @@
 .Nm
 is a Bourne shell script which is designed to aid you
 in updating the various configuration and other files
-associated with FreeBSD.
+associated with
+.Fx .
 It is
 .Sy HIGHLY
 recommended that you back up your
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 77612a8..65b570f 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -97,7 +97,8 @@ Assume a default answer of `Yes' for any questions asked.
 Assume a default answer of `No' for any questions asked.
 .It Fl O
 Go into a `packing list Only' mode.  This is a custom hack for the
-.Em "FreeBSD Ports Collection"
+.Fx
+.Em "Ports Collection"
 and is used to do `fake pkg_add' operations when a port is installed.
 In such cases, it is necessary to know what the final, adjusted packing
 list will look like.
@@ -248,7 +249,8 @@ directive.
 Record an
 .Ar originpath ,
 as location of the port from which package has been created in the
-.Em "FreeBSD Ports Collection" .
+.Fx
+.Em "Ports Collection" .
 It should be in the form
 .Pa MASTERCATEGORY/PORTDIR .
 .El
@@ -475,7 +477,7 @@ is unsuitable.
 The
 .Nm
 command first appeared in
-.Bx Free .
+.Fx .
 .Sh AUTHORS
 .An Jordan Hubbard
 for most of the work.
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 44f3860..a323803 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -94,7 +94,8 @@ Show the
 path recorded on package generation.  This path
 intended to give an idea as to where the underlying port, from which
 package was generated, is located in the
-.Em "FreeBSD Ports Collection" .
+.Fx
+.Em "Ports Collection" .
 .It Fl e Ar pkg-name
 If the package identified by
 .Ar pkg-name
diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8
index 879a81f..e8b6048 100644
--- a/usr.sbin/pppctl/pppctl.8
+++ b/usr.sbin/pppctl/pppctl.8
@@ -205,4 +205,5 @@ commands in
 .Sh HISTORY
 The
 .Nm
-command first appeared in FreeBSD 2.2.5.
+command first appeared in
+.Fx 2.2.5 .
diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8
index b51e35da..4355b3f 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -81,10 +81,10 @@ RPC protocol specification for the network lock manager protocol.
 .Sh BUGS
 The current implementation provides only the server side of the protocol
 (ie. clients running other OS types can establish locks on a
-.Bx Free
+.Fx
 fileserver,
 but there is currently no means for a
-.Bx Free
+.Fx
 client to establish locks).
 .Pp
 Versions 1, 2 and 3 of the protocol are supported.  However, only versions
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index bde673a..8de99d6 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -114,7 +114,7 @@ passed to
 .Pa /var/yp/Makefile ) .
 .Pp
 The
-.Bx Free
+.Fx
 version of
 .Nm
 also allows the super-user on the NIS master server to perform more
@@ -205,7 +205,7 @@ can handle several simultaneous domains, most implementations of
 can only operate on a single NIS domain, which is generally the same as
 the system default domain of the NIS master server.
 The
-.Bx Free
+.Fx
 .Nm
 attempts to overcome this problem in spite of the inherent limitations
 of the
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index 0543b75..2033679 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -132,14 +132,14 @@ The NIS maps for a particular NIS domain.
 .Xr ypxfr 8
 .Sh BUGS
 The
-.Bx Free
+.Fx
 .Nm ypxfrd
 protocol is not compatible with that used by SunOS.
 This is unfortunate
 but unavoidable: Sun's protocol is not freely available, and even if it
 were it would probably not be useful since the SunOS NIS v2 implementation
 uses the original ndbm package for its map databases whereas the
-.Bx Free
+.Fx
 implementation uses Berkeley DB.
 These two packages use vastly different
 file formats.
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 0b7c4d7..cbbc039 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -185,14 +185,14 @@ There is no way to set/view the realtime priority of process 0
 .Xr ps 1 ) .
 .Pp
 There is in
-.Bx Free
+.Fx
 no way to ensure that a process page is present in memory therefore
 the process may be stopped for pagein (see
 .Xr mprotect 2 ,
 .Xr madvise 2 ) .
 .Pp
 Under
-.Bx Free
+.Fx
 system calls are currently never preempted, therefore non-realtime
 processes can starve realtime processes, or idletime processes can
 starve normal priority processes.
@@ -201,6 +201,6 @@ starve normal priority processes.
 is the original author.
 This
 implementation in
-.Bx Free
+.Fx
 was substantially rewritten by
 .An David Greenman .
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index 4bdfed2..bc92189 100644
--- a/usr.sbin/tzsetup/tzsetup.8
+++ b/usr.sbin/tzsetup/tzsetup.8
@@ -123,5 +123,5 @@ mapping of timezone file to country and location
 The representation of certain localities as being associated with certain
 countries and/or territories is for the purposes of identification only,
 and does not imply any endorsement or rejection on the part of the
-.Tn FreeeBSD
+.Fx
 Project of the territorial claims of any entity.
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 599aceb..44e9750 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -56,7 +56,9 @@
 .Nm Yp_mkdb
 creates
 .Xr db 3
-style databases for use with FreeBSD's NIS server.
+style databases for use with
+.Fx Ns 's
+NIS server.
 .Nm Yp_mkdb
 reads data from
 .Ar inputfile ,
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 763e944..8ce6093 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -198,7 +198,7 @@ which do not run UNIX-based operating systems).
 If you plan to use a
 .Fx
 system to serve
-.No non- Ns Tn FreeBSD
+.No non- Ns Fx
 clients that
 have no support for password shadowing (which is most of them), you
 will have to disable the password shadowing entirely by uncommenting the
@@ -211,7 +211,7 @@ and
 .Pa passwd.byuid
 maps to be generated with valid encrypted password fields, which is
 necessary in order for
-.No non- Ns Tn FreeBSD
+.No non- Ns Fx
 clients to perform user
 authentication through
 .Tn NIS .