Use Fx macro wherever possible.

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

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 .

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

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.

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

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 .

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

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

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.

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"
-
+.Pp
-or in FreeBSD's equivalent but easier to read typedef'd version:
+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"

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

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

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

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

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

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

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

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.

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

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

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

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

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

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

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

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

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

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

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

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 .

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.

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

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

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

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

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

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

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

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

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

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.

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

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

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

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 .

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.

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.

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.

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.

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

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

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

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.

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

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,

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

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.

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.

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,

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.

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.

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

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

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) .

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) .

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.

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.

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.

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 ,

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 .

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

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

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

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 .

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.

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

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

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

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

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
+The LKM (Loadable Kernel Modules) facility has been deprecated in
-3.0 and above in favor of the 
+.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

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

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.

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

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

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

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

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

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

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.

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

share/man/man4/mtio.4

@@ -41,7 +41,7 @@
 .Sh NAME
 .Nm mtio
 .Nd
-.Tn FreeBSD
+.Fx
 magtape interface
 .Sh DESCRIPTION
 The special files

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
+console driver is available for the Intel-based
-system.
+.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.
+has become a standard part of
-Since FreeBSD 5.0,
+.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

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

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.

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!"

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

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

share/man/man4/tap.4

@@ -234,4 +234,4 @@ VMware
 .\" .Sh BUGS
 .Sh AUTHORS
 This man page has been obtained from
-.Bx Free .
+.Fx .

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

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 ,