Use Fx macro wherever possible.

16 files changed, 47 insertions, 27 deletions

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 .