Use Fx macro wherever possible.

45 files changed, 141 insertions, 63 deletions

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