use the UNIX-related macros (.At and .Ux) where appropriate.

ok jmc@

31 files changed, 152 insertions, 104 deletions

diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index d7b8d6801bf..07051d9d9fa 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping.8,v 1.41 2009/06/05 06:47:12 jmc Exp $
+.\"	$OpenBSD: ping.8,v 1.42 2009/10/22 12:35:53 sobrado Exp $
 .\"	$NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: June 5 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt PING 8
 .Os
 .Sh NAME
@@ -330,13 +330,17 @@ When a remote system receives a ping packet, it can do one of three things
 with the TTL field in its response:
 .Bl -bullet
 .It
-Not change it; this is what Berkeley Unix systems did before the
+Not change it; this is what Berkeley
+.Ux
+systems did before the
 .Bx 4.3 tahoe
 release.
 In this case the TTL value in the received packet will be
 255 minus the number of routers in the round trip path.
 .It
-Set it to 255; this is what current Berkeley Unix systems do.
+Set it to 255; this is what current Berkeley
+.Ux
+systems do.
 In this case the TTL value in the received packet will be
 255 minus the number of routers in the path from the remote system
 to the pinging host.
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index 053f3150d92..f4c55aea11c 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aucat.1,v 1.59 2009/10/05 07:05:24 ratchov Exp $
+.\"	$OpenBSD: aucat.1,v 1.60 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Alexandre Ratchov <alex@caoua.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 5 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt AUCAT 1
 .Os
 .Sh NAME
@@ -87,7 +87,9 @@ If the option argument is
 .Sq -
 then standard input will be used.
 .It Fl l
-Listen for incoming connections on a Unix domain socket.
+Listen for incoming connections on a
+.Ux
+domain socket.
 This allows clients to use
 .Nm
 instead of the physical audio device for audio input and output
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 145a11d9808..2f6469b4cb4 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.34 2007/05/31 19:20:08 jmc Exp $
+.\"	$OpenBSD: chpass.1,v 1.35 2009/10/22 12:35:53 sobrado Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt CHPASS 1
 .Os
 .Sh NAME
@@ -183,8 +183,9 @@ record is used.
 .Pp
 The user's
 .Ar home directory
-is the full UNIX path name where the user
-will be placed at login.
+is the full
+.Ux
+path name where the user will be placed at login.
 .Pp
 The
 .Ar shell
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 32b66f42039..a494ed83de7 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csplit.1,v 1.6 2009/02/08 17:15:11 jmc Exp $
+.\"	$OpenBSD: csplit.1,v 1.7 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2002 Tim J. Robbins.
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.11 2005/01/25 22:29:51 tjr Exp $
 .\"
-.Dd $Mdocdate: February 8 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt CSPLIT 1
 .Os
 .Sh NAME
@@ -167,7 +167,8 @@ specification.
 .Sh HISTORY
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh BUGS
 Input lines are limited to
 .Dv LINE_MAX
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 6de16d75321..c14f5479efd 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.43 2009/08/16 09:41:08 sobrado Exp $
+.\"	$OpenBSD: fstat.1,v 1.44 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)fstat.1	8.3 (Berkeley) 2/25/94
 .\"
-.Dd $Mdocdate: August 16 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt FSTAT 1
 .Os
 .Sh NAME
@@ -201,7 +201,9 @@ In all cases the first field is the domain name
 and the second field is the socket type (stream, dgram, etc).
 The remaining fields are protocol dependent.
 For TCP, it is the address of the tcpcb, and for UDP, the inpcb (socket pcb).
-For Unix domain sockets, it's the address of the socket pcb and the address
+For
+.Ux
+domain sockets, it's the address of the socket pcb and the address
 of the connected pcb (if connected).
 Otherwise the protocol number and address of the socket itself are printed.
 The attempt is to make enough information available to
@@ -210,8 +212,12 @@ permit further analysis without duplicating
 .Pp
 For example, the addresses mentioned above are the addresses which the
 .Ic netstat -A
-command would print for TCP, UDP, and Unix domain.
-A unidirectional Unix domain socket indicates the direction of flow with
+command would print for TCP, UDP, and
+.Ux
+domain.
+A unidirectional
+.Ux
+domain socket indicates the direction of flow with
 an arrow
 .Pf ( Dq <-
 or
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index bc9ff2df081..d1e427d2f95 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.16 2009/02/10 19:24:17 jmc Exp $
+.\"	$OpenBSD: less.1,v 1.17 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -23,7 +23,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 10 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt LESS 1
 .Os
 .Sh NAME
@@ -1252,7 +1252,9 @@ Selects a character set appropriate for MS-DOS.
 .It ebcdic
 Selects an EBCDIC character set.
 .It IBM-1047
-Selects an EBCDIC character set used by OS/390 Unix Services.
+Selects an EBCDIC character set used by OS/390
+.Ux
+Services.
 This is the EBCDIC analogue of latin1.
 You get similar results by setting either LESSCHARSET=IBM-1047 or
 LC_CTYPE=en_US in your environment.
diff --git a/usr.bin/lex/flex.1 b/usr.bin/lex/flex.1
index 2c4c5d6079a..55ccb45f3aa 100644
--- a/usr.bin/lex/flex.1
+++ b/usr.bin/lex/flex.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: flex.1,v 1.24 2009/03/26 08:38:39 sobrado Exp $
+.\"	$OpenBSD: flex.1,v 1.25 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: March 26 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt FLEX 1
 .Os
 .Sh NAME
@@ -3729,7 +3729,8 @@ the present form of the scanning class is experimental
 and may change considerably between major releases.
 .Sh INCOMPATIBILITIES WITH LEX AND POSIX
 .Nm
-is a rewrite of the AT&T Unix
+is a rewrite of the
+.At
 .Nm lex
 tool
 (the two implementations do not share any code, though),
diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1
index 68c90d767d1..d62c7588098 100644
--- a/usr.bin/nc/nc.1
+++ b/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.50 2009/06/05 06:47:12 jmc Exp $
+.\"     $OpenBSD: nc.1,v 1.51 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -174,7 +174,9 @@ This makes it possible to use
 .Nm
 to script telnet sessions.
 .It Fl U
-Specifies to use Unix Domain Sockets.
+Specifies to use
+.Ux
+domain sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
 .It Fl V Ar rdomain
@@ -386,7 +388,9 @@ IP for the local end of the connection:
 .Pp
 .Dl $ nc -s 10.1.2.3 host.example.com 42
 .Pp
-Create and listen on a Unix Domain Socket:
+Create and listen on a
+.Ux
+domain socket:
 .Pp
 .Dl $ nc -lU /var/tmp/dsocket
 .Pp
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1
index 005041b6897..c484e94a097 100644
--- a/usr.bin/ssh/ssh-add.1
+++ b/usr.bin/ssh/ssh-add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-add.1,v 1.46 2007/06/12 13:41:03 jmc Exp $
+.\"	$OpenBSD: ssh-add.1,v 1.47 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -37,7 +37,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -148,8 +148,9 @@ may be necessary to redirect the input from
 .Pa /dev/null
 to make this work.)
 .It Ev SSH_AUTH_SOCK
-Identifies the path of a unix-domain socket used to communicate with the
-agent.
+Identifies the path of a
+.Ux
+domain socket used to communicate with the agent.
 .El
 .Sh FILES
 .Bl -tag -width Ds
diff --git a/usr.bin/ssh/ssh-agent.1 b/usr.bin/ssh/ssh-agent.1
index 533cd6f6bd9..bbae4af92ae 100644
--- a/usr.bin/ssh/ssh-agent.1
+++ b/usr.bin/ssh/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.47 2009/03/26 08:38:39 sobrado Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.48 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SSH-AGENT 1
 .Os
 .Sh NAME
@@ -67,7 +67,9 @@ machines using
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl a Ar bind_address
-Bind the agent to the unix-domain socket
+Bind the agent to the
+.Ux
+domain socket
 .Ar bind_address .
 The default is
 .Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt .
@@ -162,8 +164,9 @@ Instead, operations that require a private key will be performed
 by the agent, and the result will be returned to the requester.
 This way, private keys are not exposed to clients using the agent.
 .Pp
-A unix-domain socket is created
-and the name of this socket is stored in the
+A
+.Ux
+domain socket is created and the name of this socket is stored in the
 .Ev SSH_AUTH_SOCK
 environment
 variable.
@@ -186,7 +189,8 @@ Contains the protocol version 2 DSA authentication identity of the user.
 .It Pa ~/.ssh/id_rsa
 Contains the protocol version 2 RSA authentication identity of the user.
 .It Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt
-Unix-domain sockets used to contain the connection to the
+.Ux
+domain sockets used to contain the connection to the
 authentication agent.
 These sockets should only be readable by the owner.
 The sockets should get automatically removed when the agent exits.
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 8c3d32aaf41..9aca407a522 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -34,8 +34,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.284 2009/10/08 20:42:12 jmc Exp $
-.Dd $Mdocdate: October 8 2009 $
+.\" $OpenBSD: ssh.1,v 1.285 2009/10/22 12:35:53 sobrado Exp $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -132,8 +132,9 @@ This can also be specified on a per-host basis in a configuration file.
 .Pp
 Agent forwarding should be enabled with caution.
 Users with the ability to bypass file permissions on the remote host
-(for the agent's Unix-domain socket)
-can access the local agent through the forwarded connection.
+(for the agent's
+.Ux
+domain socket) can access the local agent through the forwarded connection.
 An attacker cannot obtain key material from the agent,
 however they can perform operations on the keys that enable them to
 authenticate using the identities loaded into the agent.
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index eea8fad1a37..2b5feb9c974 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tftp.1,v 1.17 2007/08/06 19:16:06 sobrado Exp $
+.\"	$OpenBSD: tftp.1,v 1.18 2009/10/22 12:35:53 sobrado Exp $
 .\"	$NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt TFTP 1
 .Os
 .Sh NAME
@@ -164,7 +164,7 @@ otherwise the original filename is used.
 If the
 .Ar remote-directory
 argument is used, the remote host is assumed to be a
-.Tn UNIX
+.Ux
 machine.
 .Pp
 Note that files may only be written to if they already exist on the
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index e6dc8a25800..46f458b5bf4 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xargs.1,v 1.22 2009/02/08 17:15:10 jmc Exp $
+.\"	$OpenBSD: xargs.1,v 1.23 2009/10/22 12:35:53 sobrado Exp $
 .\"	$FreeBSD: xargs.1,v 1.30 2003/05/21 21:07:28 ru Exp $$
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: February 8 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt XARGS 1
 .Os
 .Sh NAME
@@ -327,7 +327,8 @@ The meanings of the 123, 124, and 125 exit values were taken from
 .Sh HISTORY
 The
 .Nm
-command appeared in PWB UNIX.
+command appeared in PWB
+.Ux .
 .Sh BUGS
 If
 .Ar utility
diff --git a/usr.sbin/adduser/rmgroup.8 b/usr.sbin/adduser/rmgroup.8
index 2881f215f2c..c12d0219c8c 100644
--- a/usr.sbin/adduser/rmgroup.8
+++ b/usr.sbin/adduser/rmgroup.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmgroup.8,v 1.12 2007/05/31 19:20:21 jmc Exp $
+.\"	$OpenBSD: rmgroup.8,v 1.13 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -25,18 +25,19 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $From: rmgroup.8,v 1.1 1996/11/04 17:21:11 wosch Exp $
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt RMGROUP 8
 .Os
 .Sh NAME
 .Nm rmgroup
-.Nd delete a Unix group
+.Nd delete a UNIX group
 .Sh SYNOPSIS
 .Nm rmgroup
 .Ar group
 .Sh DESCRIPTION
 .Nm
-deletes the specified Unix
+deletes the specified
+.Ux
 .Ar group
 from group database.
 .Nm
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 08fab7964f2..abfd786cf5d 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.8,v 1.32 2007/12/05 19:49:33 jmc Exp $
+.\"	$OpenBSD: apm.8,v 1.33 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 John T. Kohl
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 5 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt APM 8
 .Os
 .Sh NAME
@@ -138,7 +138,9 @@ until the system resumes from its sleep state.
 .Sh FILES
 .Bl -tag -width /var/run/apmdev -compact
 .It Pa /var/run/apmdev
-default Unix domain socket for communicating with
+default
+.Ux
+domain socket for communicating with
 .Xr apmd 8
 .El
 .Pp
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index 2b48ff2c734..2d59353a0eb 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apmd.8,v 1.39 2009/08/04 18:26:48 jmc Exp $
+.\"	$OpenBSD: apmd.8,v 1.40 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1995 John T. Kohl
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 4 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt APMD 8
 .Os
 .Sh NAME
@@ -191,7 +191,9 @@ or
 powerdown.
 .Pp
 .It /var/run/apmdev
-Default UNIX-domain socket used for communication with
+Default
+.Ux
+domain socket used for communication with
 .Xr apm 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/dvmrpctl/dvmrpctl.8 b/usr.sbin/dvmrpctl/dvmrpctl.8
index f2db92d3c39..3ca217c4720 100644
--- a/usr.sbin/dvmrpctl/dvmrpctl.8
+++ b/usr.sbin/dvmrpctl/dvmrpctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpctl.8,v 1.4 2008/12/06 21:18:16 sobrado Exp $
+.\"	$OpenBSD: dvmrpctl.8,v 1.5 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 6 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt DVMRPCTL 8
 .Os
 .Sh NAME
@@ -56,7 +56,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/dvmrpd.sockXX" -compact
 .It /var/run/dvmrpd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr dvmrpd 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/dvmrpd/dvmrpd.8 b/usr.sbin/dvmrpd/dvmrpd.8
index 88d289e8065..2c4af546a8d 100644
--- a/usr.sbin/dvmrpd/dvmrpd.8
+++ b/usr.sbin/dvmrpd/dvmrpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpd.8,v 1.5 2008/04/28 07:46:41 jmc Exp $
+.\"	$OpenBSD: dvmrpd.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 28 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt DVMRPD 8
 .Os
 .Sh NAME
@@ -101,7 +101,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/dvmrpd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr dvmrpctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ospf6ctl/ospf6ctl.8 b/usr.sbin/ospf6ctl/ospf6ctl.8
index 4d5648299f7..f5896a36c17 100644
--- a/usr.sbin/ospf6ctl/ospf6ctl.8
+++ b/usr.sbin/ospf6ctl/ospf6ctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6ctl.8,v 1.2 2008/12/28 22:05:04 sobrado Exp $
+.\"	$OpenBSD: ospf6ctl.8,v 1.3 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 28 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt OSPF6CTL 8
 .Os
 .Sh NAME
@@ -106,7 +106,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/ospf6d.sockXX" -compact
 .It /var/run/ospf6d.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ospf6d 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ospf6d/ospf6d.8 b/usr.sbin/ospf6d/ospf6d.8
index 268abe84b85..5062aa3446f 100644
--- a/usr.sbin/ospf6d/ospf6d.8
+++ b/usr.sbin/ospf6d/ospf6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.8,v 1.8 2009/01/31 19:37:12 sobrado Exp $
+.\"	$OpenBSD: ospf6d.8,v 1.9 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 31 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt OSPF6D 8
 .Os
 .Sh NAME
@@ -154,7 +154,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ospf6d.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ospf6ctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ospfctl/ospfctl.8 b/usr.sbin/ospfctl/ospfctl.8
index 92e811cc438..d74fbf26081 100644
--- a/usr.sbin/ospfctl/ospfctl.8
+++ b/usr.sbin/ospfctl/ospfctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfctl.8,v 1.20 2009/04/08 15:58:55 jmc Exp $
+.\"	$OpenBSD: ospfctl.8,v 1.21 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 8 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt OSPFCTL 8
 .Os
 .Sh NAME
@@ -119,7 +119,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/ospfd.sockXX" -compact
 .It /var/run/ospfd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ospfd 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ospfd/ospfd.8 b/usr.sbin/ospfd/ospfd.8
index c41eaffca5f..840f9f70f78 100644
--- a/usr.sbin/ospfd/ospfd.8
+++ b/usr.sbin/ospfd/ospfd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.8,v 1.23 2009/04/07 14:57:33 reyk Exp $
+.\"	$OpenBSD: ospfd.8,v 1.24 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 7 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt OSPFD 8
 .Os
 .Sh NAME
@@ -156,7 +156,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ospfd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ospfctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/pkg_add/pkg_merge.1 b/usr.sbin/pkg_add/pkg_merge.1
index 6964cea6f3b..ec0265241d9 100644
--- a/usr.sbin/pkg_add/pkg_merge.1
+++ b/usr.sbin/pkg_add/pkg_merge.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_merge.1,v 1.5 2007/05/31 19:20:26 jmc Exp $
+.\"	$OpenBSD: pkg_merge.1,v 1.6 2009/10/22 12:35:53 sobrado Exp $
 .\" Copyright (c) 2005 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt PKG_MERGE 1
 .Os
 .Sh NAME
@@ -64,7 +64,8 @@ get shared in the fat package.
 An
 .Ox
 package is a tarball conforming to the ustar specification in
-Single Unix.
+Single
+.Ux .
 Normal packages always start with a
 .Pa +CONTENTS
 file (packing-list).
diff --git a/usr.sbin/relayctl/relayctl.8 b/usr.sbin/relayctl/relayctl.8
index b5a16209201..0aab2d81b7e 100644
--- a/usr.sbin/relayctl/relayctl.8
+++ b/usr.sbin/relayctl/relayctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: relayctl.8,v 1.24 2009/08/17 11:36:01 reyk Exp $
+.\" $OpenBSD: relayctl.8,v 1.25 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 17 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt RELAYCTL 8
 .Os
 .Sh NAME
@@ -98,7 +98,8 @@ again.
 .Sh FILES
 .Bl -tag -width "/var/run/relayd.sockXX" -compact
 .It /var/run/relayd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr relayd 8 .
 .El
 .Sh ERRORS
diff --git a/usr.sbin/relayd/relayd.8 b/usr.sbin/relayd/relayd.8
index 42724f83fa0..44394789f44 100644
--- a/usr.sbin/relayd/relayd.8
+++ b/usr.sbin/relayd/relayd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.8,v 1.18 2009/09/01 13:43:36 reyk Exp $
+.\"	$OpenBSD: relayd.8,v 1.19 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 1 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt RELAYD 8
 .Os
 .Sh NAME
@@ -128,7 +128,8 @@ Produce more verbose output.
 .It /etc/relayd.conf
 Default configuration file.
 .It /var/run/relayd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr relayctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ripctl/ripctl.8 b/usr.sbin/ripctl/ripctl.8
index 63ebbbc8a03..d39f0269120 100644
--- a/usr.sbin/ripctl/ripctl.8
+++ b/usr.sbin/ripctl/ripctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripctl.8,v 1.5 2008/12/06 21:18:16 sobrado Exp $
+.\"	$OpenBSD: ripctl.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 6 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt RIPCTL 8
 .Os
 .Sh NAME
@@ -75,7 +75,8 @@ Show the Routing Information Base.
 .Sh FILES
 .Bl -tag -width "/var/run/ripd.sockXX" -compact
 .It /var/run/ripd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ripd 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/ripd/ripd.8 b/usr.sbin/ripd/ripd.8
index d2b3feb8747..8d517c6b7c2 100644
--- a/usr.sbin/ripd/ripd.8
+++ b/usr.sbin/ripd/ripd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.8,v 1.5 2007/10/24 20:28:25 claudio Exp $
+.\"	$OpenBSD: ripd.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 24 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt RIPD 8
 .Os
 .Sh NAME
@@ -72,7 +72,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ripd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr ripctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8
index 58e18bf254d..1261a81635f 100644
--- a/usr.sbin/smtpd/smtpctl.8
+++ b/usr.sbin/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.8 2009/03/23 21:48:40 jmc Exp $
+.\" $OpenBSD: smtpctl.8,v 1.9 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 23 2009 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SMTPCTL 8
 .Os
 .Sh NAME
@@ -63,7 +63,8 @@ Displays runtime statistics concerning
 .Sh FILES
 .Bl -tag -width "/var/run/smtpd.sockXX" -compact
 .It /var/run/smtpd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr smtpd 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index 22f8125b1eb..106563119dd 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.9 2009/10/22 08:22:24 jmc Exp $
+.\"	$OpenBSD: smtpd.8,v 1.10 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -109,7 +109,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/smtpd.sock
-Unix-domain socket used for communication with
+.Ux
+domain socket used for communication with
 .Xr smtpctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/snmpctl/snmpctl.8 b/usr.sbin/snmpctl/snmpctl.8
index d04e0a7599a..911374a68f7 100644
--- a/usr.sbin/snmpctl/snmpctl.8
+++ b/usr.sbin/snmpctl/snmpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpctl.8,v 1.9 2008/09/26 15:19:55 reyk Exp $
+.\" $OpenBSD: snmpctl.8,v 1.10 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 26 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SNMPCTL 8
 .Os
 .Sh NAME
@@ -105,7 +105,9 @@ An string describing an Object ID, for example
 .Sh FILES
 .Bl -tag -width "/var/run/snmpd.sockXX" -compact
 .It /var/run/snmpd.sock
-default UNIX-domain socket used for communication with
+default
+.Ux
+domain socket used for communication with
 .Xr snmpd 8
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index c902fdea0d9..97bd2e7e46e 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslogd.8,v 1.24 2007/05/31 19:20:29 jmc Exp $
+.\"	$OpenBSD: syslogd.8,v 1.25 2009/10/22 12:35:53 sobrado Exp $
 .\"
 .\" Copyright (c) 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\"     from: @(#)syslogd.8	8.1 (Berkeley) 6/6/93
 .\"	$NetBSD: syslogd.8,v 1.3 1996/01/02 17:41:48 perry Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt SYSLOGD 8
 .Os
 .Sh NAME
@@ -124,7 +124,7 @@ will only use this socket to send messages outwards, but in
 mode it will also read messages from this socket.
 .Nm
 also opens and reads messages from the
-.Tn UNIX
+.Ux
 domain socket
 .Pa /dev/log ,
 and from the special device
@@ -157,7 +157,7 @@ process ID of current
 .Nm syslogd
 .It Pa /dev/log
 name of the
-.Tn UNIX
+.Ux
 domain datagram log socket
 .It Pa /dev/klog
 kernel log device