From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Mon, 30 Jul 2007 22:11:34 +0000 (+0000)
Subject: Use .Ux for UNIX.
X-Git-Tag: v2.0.1~2516
X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain/6e61cee1e02b6cc48682a060bcf5ac4462355f2c

Use .Ux for UNIX.
---

diff --git a/games/dm/dm.8 b/games/dm/dm.8
index 2526d9a0fa..38f7de33c5 100644
--- a/games/dm/dm.8
+++ b/games/dm/dm.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)dm.8	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD: src/games/dm/dm.8,v 1.3.2.1 2000/12/08 13:40:03 ru Exp $
-.\" $DragonFly: src/games/dm/dm.8,v 1.3 2006/02/17 19:33:31 swildner Exp $
+.\" $DragonFly: src/games/dm/dm.8,v 1.4 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd May 31, 1993
 .Dt DM 8
@@ -97,7 +97,7 @@ Two problems result from
 running the games setuid
 .Dq games .
 First, all games that allow users to run
-.Tn UNIX
+.Ux
 commands should carefully
 set both the real and effective user id's immediately before executing
 those commands.  Probably more important is that
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index ab51876649..c8d7a612cc 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
 .\" $FreeBSD: src/lib/libc/compat-43/gethostid.3,v 1.5.2.6 2003/03/15 15:11:05 trhodes Exp $
-.\" $DragonFly: src/lib/libc/compat-43/gethostid.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/compat-43/gethostid.3,v 1.4 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd June 2, 1993
 .Dt GETHOSTID 3
@@ -54,7 +54,8 @@ The
 function
 establishes a 32-bit identifier for the
 current processor that is intended to be unique among all
-UNIX systems in existence.  This is normally a DARPA Internet
+.Ux
+systems in existence.  This is normally a DARPA Internet
 address for the local machine.  This call is allowed only to the
 super-user and is normally performed at boot time.
 .Pp
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 9d753e17a2..00d4033e07 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -27,7 +27,7 @@
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
 .\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.3.2.3 2003/02/23 19:45:52 trhodes Exp $
-.\" $DragonFly: src/lib/libc/db/man/dbopen.3,v 1.4 2006/05/26 19:39:36 swildner Exp $
+.\" $DragonFly: src/lib/libc/db/man/dbopen.3,v 1.5 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd September 19, 2005
 .Dt DBOPEN 3
@@ -47,7 +47,9 @@ The
 .Fn dbopen
 function
 is the library interface to database files.
-The supported file formats are btree, hashed and UNIX file oriented.
+The supported file formats are btree, hashed and
+.Ux
+file oriented.
 The btree format is a representation of a sorted, balanced tree structure.
 The hashed format is an extensible, dynamic hashing scheme.
 The flat-file format is a byte stream file with fixed or variable length
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index c7af445ed5..d35b619297 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.7.2.6 2003/03/13 18:05:37 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/fts.3,v 1.3 2006/05/26 19:39:36 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/fts.3,v 1.4 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd September 15, 2002
 .Dt FTS 3
@@ -59,7 +59,7 @@
 The
 .Nm
 functions are provided for traversing
-.Tn UNIX
+.Ux
 file hierarchies.
 A simple overview is that the
 .Fn fts_open
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 9d7b6f2a10..9d79d6f099 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.12.2.8 2001/12/14 18:33:55 ru Exp $
-.\" $DragonFly: src/lib/libc/net/rcmd.3,v 1.2 2003/06/17 04:26:44 dillon Exp $
+.\" $DragonFly: src/lib/libc/net/rcmd.3,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd March 3, 2000
 .Dt RCMD 3
@@ -118,7 +118,7 @@ in
 The control process will return diagnostic
 output from the command (unit 2) on this channel, and will also
 accept bytes on this channel as being
-.Tn UNIX
+.Ux
 signal numbers, to be
 forwarded to the process group of the command.
 If
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index 8de1495337..a73ca9028c 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -35,7 +35,7 @@
 .\"
 .\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.5.2.7 2001/12/14 18:33:57 ru Exp $
-.\" $DragonFly: src/lib/libc/stdio/fseek.3,v 1.2 2003/06/17 04:26:46 dillon Exp $
+.\" $DragonFly: src/lib/libc/stdio/fseek.3,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd March 5, 1999
 .Dt FSEEK 3
@@ -147,7 +147,7 @@ setting and storing the current value of
 the file offset into or from the object referenced by
 .Fa pos .
 On some
-.Pq non- Ns Tn UNIX
+.Pq non- Ns Ux
 systems an
 .Dq Fa fpos_t
 object may be a complex object
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index 04419e12ab..00c988e42d 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/bind.2,v 1.11.2.9 2002/07/08 13:07:42 dannyboy Exp $
-.\" $DragonFly: src/lib/libc/sys/bind.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/bind.2,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt BIND 2
@@ -58,7 +58,9 @@ requests that
 .Fa addr
 be assigned to the socket.
 .Sh NOTES
-Binding an address in the UNIX domain creates a socket in the file
+Binding an address in the
+.Ux
+domain creates a socket in the file
 system that must be deleted by the caller when it is no longer
 needed (using
 .Xr unlink 2 ) .
@@ -99,7 +101,9 @@ parameter is not in a valid part of the user
 address space.
 .El
 .Pp
-The following errors are specific to binding addresses in the UNIX domain.
+The following errors are specific to binding addresses in the
+.Ux
+domain.
 .Bl -tag -width EADDRNOTAVA
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index 44e59e0bfe..4a75a22c7f 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.11.2.8 2003/04/05 16:59:01 ceri Exp $
-.\" $DragonFly: src/lib/libc/sys/connect.2,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/connect.2,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt CONNECT 2
@@ -119,8 +119,12 @@ and a previous connection attempt
 has not yet been completed.
 .El
 .Pp
-The following errors are specific to connecting names in the UNIX domain.
-These errors may not apply in future versions of the UNIX IPC domain.
+The following errors are specific to connecting names in the
+.Ux
+domain.
+These errors may not apply in future versions of the
+.Ux
+IPC domain.
 .Bl -tag -width Er
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index ad162174bb..f4ac9ea99f 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/lib/libc/sys/getlogin.2,v 1.14.2.6 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/getlogin.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/getlogin.2,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
@@ -123,7 +123,9 @@ even though it is not the session leader, but beware that ALL processes
 in the session will change their login name at the same time, even the
 parent.
 .Pp
-This is not the same as the traditional UNIX behavior of inheriting privilege.
+This is not the same as the traditional
+.Ux
+behavior of inheriting privilege.
 .Pp
 Since the
 .Fn setlogin
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index 0968cbded3..4f011b16d2 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/getsockname.2,v 1.9.2.8 2001/12/14 18:34:00 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/getsockname.2,v 1.4 2006/04/08 08:17:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/getsockname.2,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETSOCKNAME 2
@@ -91,6 +91,8 @@ The
 function call appeared in
 .Bx 4.2 .
 .Sh BUGS
-Names bound to sockets in the UNIX domain are inaccessible;
+Names bound to sockets in the
+.Ux
+domain are inaccessible;
 .Nm
 returns a zero length name.
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index daad06e379..629ba85635 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.17.2.8 2003/01/06 23:33:59 trhodes Exp $
-.\" $DragonFly: src/lib/libc/sys/madvise.2,v 1.5 2006/12/12 00:26:38 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/madvise.2,v 1.6 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd December 12, 2006
 .Dt MADVISE 2
@@ -116,7 +116,9 @@ need the data being stored in that area to be physically written to disk.
 With this feature you get the equivalent performance with mmap that you
 would expect to get with SysV shared memory calls, but in a more controllable
 and less restrictive manner.  However, note that this feature is not portable
-across UNIX platforms (though some may do the right thing by default).
+across
+.Ux
+platforms (though some may do the right thing by default).
 For more information see the MAP_NOSYNC section of
 .Xr mmap 2
 .It Dv MADV_AUTOSYNC
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 60017e89e6..765adcf88f 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/sys/socketpair.2,v 1.6.2.6 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/socketpair.2,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/socketpair.2,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt SOCKETPAIR 2
@@ -92,5 +92,5 @@ function call appeared in
 .Bx 4.2 .
 .Sh BUGS
 This call is currently implemented only for the
-.Tn UNIX
+.Ux
 domain.
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index 39ab574b92..9b778cc316 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)rexec.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libcompat/4.3/rexec.3,v 1.5.2.4 2001/08/17 15:42:56 ru Exp $
-.\" $DragonFly: src/lib/libcompat/4.3/rexec.3,v 1.2 2003/06/17 04:26:49 dillon Exp $
+.\" $DragonFly: src/lib/libcompat/4.3/rexec.3,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt REXEC 3
@@ -100,7 +100,7 @@ in
 The control process will return diagnostic
 output from the command (unit 2) on this channel, and will also
 accept bytes on this channel as being
-.Tn UNIX
+.Ux
 signal numbers, to be
 forwarded to the process group of the command.  The diagnostic
 information returned does not include remote authorization failure,
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index 67853a1b8a..12f8207dc3 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libskey/skey.3,v 1.10.2.1 2000/04/22 16:36:00 phantom Exp $
-.\" $DragonFly: src/lib/libskey/skey.3,v 1.5 2006/05/26 19:39:38 swildner Exp $
+.\" $DragonFly: src/lib/libskey/skey.3,v 1.6 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd December 22, 1996
 .Dt SKEY 3
@@ -121,28 +121,39 @@ The
 .Fn skey_crypt
 is a wrapper function for the standard library
 .Xr crypt 3 ,
-which returns the encrypted UNIX password if either the given
+which returns the encrypted
+.Ux
+password if either the given
 s/key or regular passwords are ok.
 .Fn skey_crypt
 first attempts verification of the given password via the skey
 method, and will return the encrypted password from the
 passwd structure if it can be verified, as though the user had
-actually entered the correct UNIX password.
+actually entered the correct
+.Ux
+password.
 If s/key password verification does not work, then the password
 is encrypted in the usual way and the result passed back to the
 caller.
 If the passwd structure pointer is NULL,
 .Fn skey_crypt
 returns a non-NULL string which could not possibly be a valid
-UNIX password (namely, a string containing ":").
+.Ux
+password (namely, a string containing ":").
 .Pp
 The
 .Fn skeyaccess
-function determines whether traditional UNIX (non-S/Key) passwords
+function determines whether traditional
+.Ux
+(non-S/Key) passwords
 are permitted for any combination of user name, group member,
-terminal port, host name, and network.  If UNIX passwords are allowed,
+terminal port, host name, and network.  If
+.Ux
+passwords are allowed,
 .Fn skeyaccess
-returns a non-zero value.  If UNIX passwords are not allowed, it
+returns a non-zero value.  If
+.Ux
+passwords are not allowed, it
 returns 0.  See
 .Xr skey.access 5
 for more information on the layout and structure of the
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index e5ee872dfa..3c26dca9f1 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.31.2.18 2003/02/11 14:28:28 yar Exp $
-.\" $DragonFly: src/libexec/ftpd/ftpd.8,v 1.5 2006/04/08 08:17:07 swildner Exp $
+.\" $DragonFly: src/libexec/ftpd/ftpd.8,v 1.6 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd January 27, 2000
 .Dt FTPD 8
@@ -289,7 +289,7 @@ is specified.
 .El
 .Pp
 The following non-standard or
-.Tn UNIX
+.Ux
 specific commands are supported
 by the
 SITE request.
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 4dd8400ed6..c1ae5f9527 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/wl.4,v 1.10.2.5 2002/03/19 18:24:15 schweikh Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/wl.4,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/wl.4,v 1.3 2007/07/30 22:11:32 swildner Exp $
 .Dd July 7, 1997
 .Dt WL 4 i386
 .Os
@@ -72,8 +72,9 @@ The card can either be initialized with the vendor supplied DOS setup software.
 Typically minimally an IRQ, port, and Network ID must be supplied.
 Michael Smith's
 .Xr wlconfig 8
-utility can now be used to do this work from
-the UNIX side.  The card is "not" plug and play.
+utility can now be used to do this work from the
+.Ux
+side.  The card is "not" plug and play.
 The network id controls whether one set of cards can hear another.
 If different, cards will read physical packets, but they will be discarded
 by the radio modem.
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index e95885eb4f..e427defdf2 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
 .\" $FreeBSD: src/share/man/man4/netintro.4,v 1.10.2.6 2002/08/30 14:23:38 sobomax Exp $
-.\" $DragonFly: src/share/man/man4/netintro.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\" $DragonFly: src/share/man/man4/netintro.4,v 1.3 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd November 30, 1993
 .Dt NETINTRO 4
@@ -155,7 +155,7 @@ are known to the system
 #define    AF_ISO       18   /* ISO protocols */
 .Ed
 .Sh ROUTING
-.Tn UNIX
+.Ux
 provides some packet routing facilities.
 The kernel maintains a routing information database, which
 is used in selecting the appropriate network interface when
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 634d28d178..c4b7c32a1b 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $FreeBSD: src/share/man/man4/vinum.4,v 1.22.2.9 2002/04/22 08:19:35 kuriyama Exp $
-.\" $DragonFly: src/share/man/man4/vinum.4,v 1.11 2007/07/29 17:27:45 swildner Exp $
+.\" $DragonFly: src/share/man/man4/vinum.4,v 1.12 2007/07/30 22:11:32 swildner Exp $
 .\"
 .Dd May 16, 2002
 .Dt VINUM 4
@@ -452,7 +452,7 @@ The two control devices for
 are used to synchronize the debug status of kernel and user modules.
 .It
 Unlike
-.Nm UNIX
+.Ux
 drives,
 .Nm
 volumes are not subdivided into partitions, and thus do not contain a disk
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 2708b8d516..a2d92cf0de 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -23,7 +23,7 @@
 .\"SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/share/man/man5/elf.5,v 1.6.2.8 2001/12/17 11:30:13 ru Exp $
-.\"	$DragonFly: src/share/man/man5/elf.5,v 1.4 2006/05/26 19:39:40 swildner Exp $
+.\"	$DragonFly: src/share/man/man5/elf.5,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
@@ -229,7 +229,8 @@ The following values are currently defined:
 .Pp
 .Bl -tag -width "ELFOSABI_STANDALONE" -compact
 .It Dv ELFOSABI_SYSV
-UNIX System V ABI.
+.At V
+ABI.
 .It Dv ELFOSABI_HPUX
 HP-UX operating system ABI.
 .It Dv ELFOSABI_NETBSD
@@ -251,7 +252,9 @@ IRIX operating system ABI.
 .Fx
 operating system ABI.
 .It Dv ELFOSABI_TRU64
-TRU64 UNIX operating system ABI.
+TRU64
+.Ux
+operating system ABI.
 .It Dv ELFOSABI_ARM
 ARM architecture ABI.
 .It Dv ELFOSABI_STANDALONE
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index aee95637ce..fee99919bd 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/share/man/man5/fs.5,v 1.10.2.4 2001/12/17 11:30:14 ru Exp $
-.\" $DragonFly: src/share/man/man5/fs.5,v 1.3 2006/05/26 19:39:40 swildner Exp $
+.\" $DragonFly: src/share/man/man5/fs.5,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd April 19, 1994
 .Dt FS 5
@@ -361,7 +361,7 @@ the cylinder group structure
 The
 .Em Inode :
 The inode is the focus of all file activity in the
-.Tn UNIX
+.Ux
 file system.
 There is a unique inode allocated
 for each active file,
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index a06c9c06f2..e6a94c7aa5 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/fstab.5,v 1.11.2.8 2003/02/10 12:21:08 des Exp $
-.\" $DragonFly: src/share/man/man5/fstab.5,v 1.3 2006/04/17 18:01:37 swildner Exp $
+.\" $DragonFly: src/share/man/man5/fstab.5,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt FSTAB 5
@@ -93,11 +93,11 @@ compile other filesystems as well.
 .Bl -tag -width indent -offset indent
 .It Em ufs
 a local
-.Tn UNIX
+.Ux
 filesystem
 .It Em mfs
 a local memory-based
-.Tn UNIX
+.Ux
 filesystem
 .It Em nfs
 a Sun Microsystems compatible ``Network File System''
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 1a0558cbfd..6084f1cd54 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/passwd.5,v 1.26.2.5 2002/02/01 15:51:18 ru Exp $
-.\" $DragonFly: src/share/man/man5/passwd.5,v 1.7 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man5/passwd.5,v 1.8 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
@@ -174,7 +174,7 @@ use this field will substitute it with a capitalized version
 of the account's login name.
 .Pp
 The user's home directory is the full
-.Tn UNIX
+.Ux
 path name where the user
 will be placed on login.
 .Pp
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 14e73c486c..78791295ae 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/remote.5,v 1.5.2.4 2001/08/17 13:08:47 ru Exp $
-.\" $DragonFly: src/share/man/man5/remote.5,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man5/remote.5,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 5, 1993
 .Dt REMOTE 5
@@ -111,7 +111,7 @@ disconnect is requested by the user.
 This host is on a dial-up line.
 .It Cm \&dv
 (str)
-.Tn UNIX
+.Ux
 device(s) to open to establish a connection.
 If this file refers to a terminal line,
 .Xr tip 1
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 8d9b3e4eb0..a9af66cd85 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.6 2002/08/14 11:38:30 ru Exp $
-.\" $DragonFly: src/usr.bin/csplit/csplit.1,v 1.2 2006/02/17 19:39:01 swildner Exp $
+.\" $DragonFly: src/usr.bin/csplit/csplit.1,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 19, 2004
 .Dt CSPLIT 1
@@ -151,7 +151,8 @@ utility conforms to
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 8e74c1dd40..46b1600611 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)head.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/head/head.1,v 1.4.2.6 2002/07/15 06:33:12 keramida Exp $
-.\" $DragonFly: src/usr.bin/head/head.1,v 1.2 2003/06/17 04:29:27 dillon Exp $
+.\" $DragonFly: src/usr.bin/head/head.1,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
@@ -67,4 +67,5 @@ is the name of the file.
 .Sh HISTORY
 The
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
diff --git a/usr.bin/keyinit/keyinit.1 b/usr.bin/keyinit/keyinit.1
index 4918d65a52..dfa4e7c1fa 100644
--- a/usr.bin/keyinit/keyinit.1
+++ b/usr.bin/keyinit/keyinit.1
@@ -1,6 +1,6 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
 .\" $FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.8 2000/03/01 12:19:47 sheldonh Exp $
-.\" $DragonFly: src/usr.bin/keyinit/keyinit.1,v 1.3 2005/08/01 01:49:17 swildner Exp $
+.\" $DragonFly: src/usr.bin/keyinit/keyinit.1,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
@@ -18,8 +18,9 @@ initializes the system so you can use S/Key one-time passwords to
 login.  The program will ask you to enter a secret pass phrase; enter a
 phrase of several words in response.
 After the S/Key database has been
-updated you can login using either your regular UNIX password or using
-S/Key one-time passwords.
+updated you can login using either your regular
+.Ux
+password or using S/Key one-time passwords.
 .Pp
 When logging in from another machine you can avoid typing a real
 password over the network, by typing your S/Key pass phrase to the
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 7c270ec3a3..d22b432140 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,6 +1,6 @@
 .\"	@(#) $OpenBSD: m4.1,v 1.24 2002/04/18 18:57:23 espie Exp $
 .\" $FreeBSD: src/usr.bin/m4/m4.1,v 1.27 2005/01/17 07:44:22 ru Exp $
-.\" $DragonFly: src/usr.bin/m4/m4.1,v 1.4 2007/01/01 00:41:58 pavalos Exp $
+.\" $DragonFly: src/usr.bin/m4/m4.1,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd July 3, 2004
 .Dt M4 1
@@ -421,7 +421,8 @@ conforms to
 .Sh HISTORY
 An
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh AUTHORS
 .An -nosplit
 .An Ozan Yigit Aq oz@sis.yorku.ca
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 4ed2e5c3ca..af5834fb80 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -31,7 +31,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\" $FreeBSD: src/usr.bin/make/make.1,v 1.29.2.15 2002/12/17 19:01:18 seanc Exp $
-.\" $DragonFly: src/usr.bin/make/make.1,v 1.30 2007/05/17 08:19:02 swildner Exp $
+.\" $DragonFly: src/usr.bin/make/make.1,v 1.31 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd March 30, 2005
 .Dt MAKE 1
@@ -1497,7 +1497,8 @@ in
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh BUGS
 The determination of
 .Va .OBJDIR
diff --git a/usr.bin/tabs/tabs.1 b/usr.bin/tabs/tabs.1
index b3722903e9..0a859acf66 100644
--- a/usr.bin/tabs/tabs.1
+++ b/usr.bin/tabs/tabs.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/tabs/tabs.1,v 1.6 2002/11/26 17:33:36 ru Exp $
-.\" $DragonFly: src/usr.bin/tabs/tabs.1,v 1.2 2005/08/01 01:49:18 swildner Exp $
+.\" $DragonFly: src/usr.bin/tabs/tabs.1,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 19, 2004
 .Dt TABS 1
@@ -150,7 +150,8 @@ utility conforms to
 .Sh HISTORY
 A
 .Nm
-utility appeared in PWB UNIX.
+utility appeared in PWB
+.Ux .
 .Sh BUGS
 The current
 .Xr termcap 5
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 2b29449735..f97203c1c9 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/tail/tail.1,v 1.5.2.4 2002/07/15 07:46:27 keramida Exp $
-.\" $DragonFly: src/usr.bin/tail/tail.1,v 1.2 2003/06/17 04:29:32 dillon Exp $
+.\" $DragonFly: src/usr.bin/tail/tail.1,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
@@ -181,4 +181,5 @@ option and display the last 4 lines of the input.
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index e18fca89e5..b1ecdf2e15 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/tftp/tftp.1,v 1.4.2.7 2002/06/21 15:29:33 charnier Exp $
-.\" $DragonFly: src/usr.bin/tftp/tftp.1,v 1.3 2006/02/17 19:39:11 swildner Exp $
+.\" $DragonFly: src/usr.bin/tftp/tftp.1,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
@@ -137,7 +137,7 @@ If the latter form is used,
 the hostname specified becomes the default for future transfers.
 If the remote-directory form is used, the remote host is
 assumed to be a
-.Tn UNIX
+.Ux
 machine.
 If you need to specify IPv6 numeric address to
 .Ar hosts ,
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b1a2f77414..5e1b59c1fe 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD: src/usr.bin/uname/uname.1,v 1.8.2.4 2002/10/17 07:47:29 jmallett Exp $
-.\" $DragonFly: src/usr.bin/uname/uname.1,v 1.4 2006/02/17 19:39:13 swildner Exp $
+.\" $DragonFly: src/usr.bin/uname/uname.1,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd October 24, 2003
 .Dt UNAME 1
@@ -104,4 +104,5 @@ specification.
 .Sh HISTORY
 The
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 49f5f4694c..dc95bc391a 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/wall/wall.1,v 1.3.2.5 2002/07/15 08:14:59 keramida Exp $
-.\" $DragonFly: src/usr.bin/wall/wall.1,v 1.2 2003/06/17 04:29:33 dillon Exp $
+.\" $DragonFly: src/usr.bin/wall/wall.1,v 1.3 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd June 6, 1993
 .Dt WALL 1
@@ -69,4 +69,5 @@ receive the message.
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 31bd415f38..f15d158669 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.6.2.12 2003/06/01 21:40:35 mux Exp $
-.\" $DragonFly: src/usr.bin/xargs/xargs.1,v 1.3 2004/03/11 12:28:58 hmp Exp $
+.\" $DragonFly: src/usr.bin/xargs/xargs.1,v 1.4 2007/07/30 22:11:33 swildner Exp $
 .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $
 .\"
 .Dd May 7, 2001
@@ -294,7 +294,8 @@ extensions which may not be available on other operating systems.
 .Sh HISTORY
 The
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh BUGS
 If
 .Ar utility
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 11d0074352..b5b51c0094 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
 .\" $FreeBSD: src/usr.bin/yacc/yacc.1,v 1.10.2.2 2003/02/25 03:07:40 trhodes Exp $
-.\" $DragonFly: src/usr.bin/yacc/yacc.1,v 1.4 2006/02/17 19:39:18 swildner Exp $
+.\" $DragonFly: src/usr.bin/yacc/yacc.1,v 1.5 2007/07/30 22:11:33 swildner Exp $
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
@@ -171,4 +171,5 @@ utility conforms to
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 684b267d17..4a023b36cf 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.27.2.11 2003/04/28 08:34:04 brueffer Exp $
-.\" $DragonFly: src/usr.sbin/moused/moused.8,v 1.6 2007/04/07 19:29:52 swildner Exp $
+.\" $DragonFly: src/usr.sbin/moused/moused.8,v 1.7 2007/07/30 22:11:34 swildner Exp $
 .\"
 .Dd April 1, 2000
 .Dt MOUSED 8
@@ -570,7 +570,8 @@ process id of the currently running
 .Nm
 utility
 .It Pa /var/run/MouseRemote
-UNIX-domain stream socket for X10 MouseRemote events
+.Ux Ns -domain
+stream socket for X10 MouseRemote events
 .El
 .Sh EXAMPLES
 .Dl moused -p /dev/cuaa0 -i type
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index d293cd5548..d67b93022a 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -1,7 +1,7 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .\"
 .\" $FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.16.2.8 2003/03/11 22:31:29 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/mrouted/mrouted.8,v 1.3 2006/02/17 19:40:18 swildner Exp $
+.\" $DragonFly: src/usr.sbin/mrouted/mrouted.8,v 1.4 2007/07/30 22:11:34 swildner Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
@@ -269,7 +269,8 @@ A tunnel must be configured on both routers before it can be used.
 Be careful that the unicast route to the remote address goes out the
 interface specified by the
 .Ar "local-addr|ifname"
-argument.  Some UNIX
+argument.  Some
+.Ux
 kernels rewrite the source address of
 .Nm Ns 's
 packets on their way out to contain the address of the transmission
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index 00643feeb6..63040381d0 100644
--- a/usr.sbin/pw/pw.8
+++ b/usr.sbin/pw/pw.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.19.2.12 2003/05/08 15:01:44 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/pw/pw.8,v 1.3 2006/02/17 19:40:21 swildner Exp $
+.\" $DragonFly: src/usr.sbin/pw/pw.8,v 1.4 2007/07/30 22:11:34 swildner Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW 8
@@ -375,7 +375,9 @@ default determined from
 with the account name as a subdirectory.
 .It Fl e Ar date
 Set the account's expiration date.
-Format of the date is either a UNIX time in decimal, or a date in
+Format of the date is either a
+.Ux
+time in decimal, or a date in
 .Ql dd-mmm-yy[yy]
 format, where dd is the day, mmm is the month, either in numeric or alphabetic format
 ('Jan', 'Feb', etc) and year is either a two or four digit year.
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index c87ea1d0fb..153be60c12 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.35 2004/07/03 18:35:53 ru Exp $
-.\" $DragonFly: src/usr.sbin/syslogd/syslog.conf.5,v 1.8 2007/05/02 16:37:36 reed Exp $
+.\" $DragonFly: src/usr.sbin/syslogd/syslog.conf.5,v 1.9 2007/07/30 22:11:34 swildner Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
@@ -501,6 +501,7 @@ implement the same set of facilities.
 The facilities
 authpriv, cron, ftp, and ntp that are known to this implementation
 might be absent on the target system.
-Even worse, DEC UNIX uses
-facility number 10 (which is authpriv in this implementation) to
+Even worse, DEC
+.Ux
+uses facility number 10 (which is authpriv in this implementation) to
 log events for their AdvFS file system.
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 1f58b3eebe..3f5a91ceb4 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22.2.8 2002/12/29 16:35:44 schweikh Exp $
-.\" $DragonFly: src/usr.sbin/ypserv/ypserv.8,v 1.6 2006/05/26 19:39:41 swildner Exp $
+.\" $DragonFly: src/usr.sbin/ypserv/ypserv.8,v 1.7 2007/07/30 22:11:34 swildner Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -44,7 +44,8 @@
 .Op Fl p Ar path
 .Sh DESCRIPTION
 .Tn NIS
-is an RPC-based service designed to allow a number of UNIX-based
+is an RPC-based service designed to allow a number of
+.Ux Ns -based
 machines to share a common set of configuration files.
 Rather than
 requiring a system administrator to update several copies of files
@@ -193,7 +194,9 @@ The
 .Sq TCP port less than 1024
 test is trivial to defeat for users with
 unrestricted access to machines on your network (even those machines
-which do not run UNIX-based operating systems).
+which do not run
+.Ux Ns -based
+operating systems).
 .It
 If you plan to use a
 .Dx