Use Fx macro wherever possible.

4 files changed, 32 insertions, 19 deletions

diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index 864e347..3082636 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -59,7 +59,7 @@ Note that
 may be floating point.  Don't use 
 .Fn clock
 in new programs under
-.Tn FreeBSD .
+.Fx .
 It is feeble compared with
 .Xr getrusage 2 .
 It is provided for ANSI conformance.  It is implemented by calling
@@ -80,7 +80,7 @@ Note that its frequency may be different from
 Don't use 
 .Xr times 3
 in new programs under
-.Tn FreeBSD .
+.Fx .
 It is feeble compared with
 .Xr gettimeofday 2
 together with 
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 5880fdc..73d3b6f 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -335,7 +335,7 @@ see
 .It Li local/
 local executables, libraries, etc.
 Also used as the default destination for the
-.Tn FreeBSD
+.Fx
 ports framework.
 Within local/, the general layout sketched out by
 .Xr hier 7
@@ -346,7 +346,7 @@ rather than under local/share/.  Ports documentation is in share/doc/<port>/
 architecture-specific target tree produced by building the /usr/src tree
 .It Li ports
 The
-.Tn FreeBSD
+.Fx
 ports collection (optional).
 .It Li sbin/
 system daemons & system utilities (executed by users)
@@ -390,7 +390,7 @@ association)
 .It Li FAQ/
 Frequently Asked Questions
 .It Li handbook/
-.Tn FreeBSD
+.Fx
 Handbook
 .It Li papers/
 UNIX Papers
@@ -519,7 +519,7 @@ src for files in /usr/lib
 src for files in /usr/libexec
 .It Li release/
 files required to produce a
-.Tn FreeBSD 
+.Fx 
 release
 .It Li sbin/
 src for files in /sbin
@@ -530,7 +530,8 @@ src for files in /usr/share
 .It Li sys/
 kernel src files
 .It Li tools/
-tools used for maintenance and testing of FreeBSD
+tools used for maintenance and testing of
+.Fx
 .It Li usr.bin/
 src for files in /usr/bin
 .It Li usr.sbin/
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index a55d0e7..0e48665 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -533,7 +533,7 @@ and if it is specified,
 the volume title may be omitted.
 .Pp
 Under
-.Tn FreeBSD ,
+.Fx ,
 the following section numbers and their descriptions are described below:
 .Pp
 .Bl -column SMM -offset indent -compact
@@ -579,7 +579,7 @@ The name of the operating system
 should be the common acronym, e.g.
 .Tn BSD
 or
-.Tn FreeBSD
+.Fx
 or
 .Tn ATT .
 The release should be the standard release
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 9a6f09f..d9c1359 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -33,7 +33,8 @@
 .Nd contributed applications
 .Sh DESCRIPTION
 The
-.Nm FreeBSD Ports Collection
+.Fx
+.Nm Ports Collection
 offers a simple way for users and
 administrators to install applications.
 Each 
@@ -51,7 +52,9 @@ simply type
 .Ic make install
 to install the application.
 .Pp
-It is possible to download and use ports from the FreeBSD repository
+It is possible to download and use ports from the
+.Fx
+repository
 that are newer than the installed system; however it is important to
 install the appropriate "Upgrade Kit" from http://www.FreeBSD.org/ports/
 first!  The
@@ -66,7 +69,9 @@ For information about creating new ports, see
 .Nm Porting applications
 (file:/usr/share/doc/handbook/porting.html --or--
 http://www.FreeBSD.org/handbook/porting.html).
-Both are part of the FreeBSD Handbook.
+Both are part of the
+.Fx
+Handbook.
 .Pp
 .Sh TARGETS
 .Pp
@@ -188,11 +193,9 @@ You can change all of these.
 Location of the ports tree.  This is
 .Pa /usr/ports
 on
-.\" .Fx
-FreeBSD
+.Fx
 and
-.\" .Ox ,
-OpenBSD
+.Ox
 and
 .Pa /usr/pkgsrc
 on
@@ -236,7 +239,9 @@ Primary sites for distribution files if not found locally.
 Primary location(s) for distribution patch files if not found
 locally.
 .It Ev MASTER_SITE_FREEBSD
-If set, go to the master FreeBSD site for all files.
+If set, go to the master
+.Fx
+site for all files.
 .It Ev MASTER_SITE_OVERRIDE
 Try going to this site for all files and patches, first.
 .It Ev NOCLEANDEPENDS
@@ -258,7 +263,12 @@ If defined, only operate on a port if it can be installed 100% automatically.
 .Sh FILES
 .Bl -tag -width /usr/ports/xxxx -compact
 .It Pa /usr/ports
-The default ports directory (FreeBSD and OpenBSD).
+The default ports directory
+.Po
+.Fx
+and
+.Ox
+.Pc .
 .It Pa /usr/pkgsrc
 The default ports directory (NetBSD).
 .It Pa /usr/ports/Mk/bsd.port.mk
@@ -277,7 +287,9 @@ The following are part of the ports collection:
 .Xr portcheckout 1 ,
 .Xr portlint 1
 .Pp
-The FreeBSD handbook
+The
+.Fx
+handbook
 .Pp
 http://www.FreeBSD.org/ports
 .Pq searchable index of all ports