5 files changed, 12 insertions, 5 deletions
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 5937308..0b287e1 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -74,7 +74,9 @@ by the processes PID, and
 .Em \&%U
 by the UID.  The name defaults to
 .Em \&%N.core ,
-yielding the traditional FreeBSD behaviour.
+yielding the traditional
+.Fx
+behaviour.
 .Pp
 The core file consists of the
 .Fa u .
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index fe3ad28..ab81b22 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -150,7 +150,8 @@ struct dirent {
 .Xr fs 5 ,
 .Xr inode 5
 .Sh BUGS
-The usage of the member d_type of struct dirent is unportable as it is FreeBSD-specific.
+The usage of the member d_type of struct dirent is unportable as it is
+.Fx Ns -specific .
 It also may fail on certain filesystems, for example the cd9660 filesystem.
 .Sh HISTORY
 A
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 5df3e04..3be41df 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -129,7 +129,9 @@ Longer lines will be skipped.
 This limitation disappeared in
 .Fx 3.0 .
 Older binaries that are statically linked, depend on old
-shared libraries, or non-FreeBSD binaries in compatibility mode
+shared libraries, or
+.No non- Ns Fx
+binaries in compatibility mode
 may still have this limits.
 .Sh FILES
 .Bl -tag -width /etc/group -compact
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index d683aa0..aa4f4e3 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -508,7 +508,7 @@ On SunOS systems, this field contains an open file descriptor to
 .Dq Pa /dev/zero
 used to get demand paged zeroed pages.
 On
-.Tn FreeBSD
+.Fx
 systems it contains -1.
 .It Fa crt_ldfd
 Contains an open file descriptor that was used by crt0 to load
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 7729de0..537713c 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -56,7 +56,9 @@ Initial settings for
 .Xr sysctl 8 .
 .Sh EXAMPLES
 To turn off logging of programs that exit due to fatal signals, as well as
-telling Linux programs that you are running FreeBSD 3.4-STABLE, you may use
+telling Linux programs that you are running
+.Fx
+3.4-STABLE, you may use
 a configuration like
 .Bd -literal -offset indent
 # Configure logging and Linux execution.