5 files changed, 20 insertions, 8 deletions

diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 4fba880c4db2..ba2fdece31a6 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -116,7 +116,7 @@ Each system's heuristics for picking the correct time are slightly
 different.
 .Pp
 The
-.Tn FreeBSD
+.Fx
 implementation should do a better job of validating the time provided in
 .Fa base 
 when the battery-backed clock is unusable.  Currently it unconditionally
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index 3a02d7360b99..fb3a6b88b55a 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -68,7 +68,9 @@ appear.
 .Sh PROPERLY HIDING EXTENSIONS
 The following test macros are set up in <sys/_posix.h>.  They should
 used by system header files to avoid the kind of tests you see in
-<sys/_posix.h>.  Source programs should not use these FreeBSD specific
+<sys/_posix.h>.  Source programs should not use these
+.Fx
+specific
 implementation details and should test _POSIX_VERSION, _POSIX_SOURCE
 and _POSIX_C_SOURCE.
 These should not be used in the kernel though - the kernel should be
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index f401a14d3225..b463e734523b 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -191,7 +191,7 @@ Unix.  They have been traditionally known by number instead of by
 names, and were inclusive up to higher priority levels (i.e., priority
 5 has been blocking everything up to level 5).  This is no longer the
 case in
-.Tn FreeBSD .
+.Fx .
 The traditional name
 .Ql level
 for them is still reflected in the letter
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index fcf1a07a430f..07f128ee3642 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -32,7 +32,7 @@
 .Nd "Kernel source file style guide"
 .Sh DESCRIPTION
 This file specifies the preferred style for kernel source files in the
-.Tn FreeBSD
+.Fx
 source tree.  It is also a guide for preferred userland code style.
 .Bd -literal -offset 0i
 /*
@@ -562,5 +562,5 @@ the
 .Tn BSD 
 4.4-Lite2 release, with updates to reflect the current practice and
 desire of the
-.Tn FreeBSD
+.Fx
 project.
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index dffb25cbac6a..8f7db5d40787 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -179,11 +179,21 @@ same manner as
 .Fn timeout .
 .Sh HISTORY
 The current timeout and untimeout routines are based on the work of
-Adam M. Costello and George Varghese, published in a technical report entitled
+.An Adam M. Costello
+and
+.An George Varghese ,
+published in a technical report entitled
 .%T "Redesigning the BSD Callout and Timer Facilities"
-and modified slightly for inclusion in FreeBSD by Justin T. Gibbs.
+and modified slightly for inclusion in
+.Fx
+by
+.An Justin T. Gibbs .
 The original work on the data structures used in this implementation
-was published by G.Varghese and A. Lauck in the paper
+was published by
+.An G. Varghese
+and
+.An A. Lauck
+in the paper
 .%T "Hashed and Hierarchical Timing Wheels: Data Structures for the Efficient Implementation of a Timer Facility" 
 in the
 .%B "Proceedings of the 11th ACM Annual Symposium on Operating Systems Principles" .