write UNIX-domain in a more consistent way; while here, replace a

few remaining ".Tn UNIX" macros with ".Ux" ones.

pointed out by ratchov@, thanks!

ok jmc@

23 files changed, 86 insertions, 88 deletions

diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index eb087027a9c..9fa435d21b5 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unix.4,v 1.8 2008/10/22 16:55:30 sobrado Exp $
+.\"	$OpenBSD: unix.4,v 1.9 2009/10/22 15:02:12 sobrado Exp $
 .\"	$NetBSD: unix.4,v 1.3 1994/11/30 16:22:43 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)unix.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: October 22 2008 $
+.Dd $Mdocdate: October 22 2009 $
 .Dt UNIX 4
 .Os
 .Sh NAME
@@ -41,14 +41,14 @@
 .Fd #include <sys/un.h>
 .Sh DESCRIPTION
 The
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 protocol family is a collection of protocols
 that provides local (on-machine) interprocess
 communication through the normal
 .Xr socket 2
 mechanisms.
 The
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 family supports the
 .Dv SOCK_STREAM
 and
@@ -56,7 +56,7 @@ and
 socket types and uses
 filesystem pathnames for addressing.
 .Sh ADDRESSING
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 addresses are variable-length filesystem pathnames of
 at most 104 characters.
 The include file
@@ -71,7 +71,7 @@ struct sockaddr_un {
 .Ed
 .Pp
 Binding a name to a
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 socket with
 .Xr bind 2
 causes a socket file to be created in the filesystem.
@@ -82,14 +82,14 @@ removed when the socket is closed\(em\c
 must be used to remove the file.
 .Pp
 The
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 protocol family does not support broadcast addressing or any form
 of
 .Dq wildcard
 matching on incoming messages.
 All addresses are absolute- or relative-pathnames
 of other
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 sockets.
 Normal filesystem access-control mechanisms are also
 applied when referencing pathnames; e.g., the destination
@@ -100,7 +100,7 @@ or
 must be writable.
 .Sh PROTOCOLS
 The
-.Tn UNIX Ns -domain
+.Ux Ns -domain
 protocol family is comprised of simple
 transport protocols that support the
 .Dv SOCK_STREAM
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index f4c55aea11c..d498b0fa61b 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aucat.1,v 1.60 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: aucat.1,v 1.61 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Alexandre Ratchov <alex@caoua.org>
 .\"
@@ -88,8 +88,8 @@ If the option argument is
 then standard input will be used.
 .It Fl l
 Listen for incoming connections on a
-.Ux
-domain socket.
+.Ux Ns -domain
+socket.
 This allows clients to use
 .Nm
 instead of the physical audio device for audio input and output
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index c14f5479efd..58c2cba25ec 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.44 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: fstat.1,v 1.45 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -202,8 +202,8 @@ 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
-.Ux
-domain sockets, it's the address of the socket pcb and the address
+.Ux Ns -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
@@ -213,11 +213,10 @@ permit further analysis without duplicating
 For example, the addresses mentioned above are the addresses which the
 .Ic netstat -A
 command would print for TCP, UDP, and
-.Ux
-domain.
+.Ux Ns -domain.
 A unidirectional
-.Ux
-domain socket indicates the direction of flow with
+.Ux Ns -domain
+socket indicates the direction of flow with
 an arrow
 .Pf ( Dq <-
 or
diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1
index d62c7588098..72885471f28 100644
--- a/usr.bin/nc/nc.1
+++ b/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.51 2009/10/22 12:35:53 sobrado Exp $
+.\"     $OpenBSD: nc.1,v 1.52 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -175,8 +175,8 @@ This makes it possible to use
 to script telnet sessions.
 .It Fl U
 Specifies to use
-.Ux
-domain sockets.
+.Ux Ns -domain
+sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
 .It Fl V Ar rdomain
@@ -389,8 +389,8 @@ IP for the local end of the connection:
 .Dl $ nc -s 10.1.2.3 host.example.com 42
 .Pp
 Create and listen on a
-.Ux
-domain socket:
+.Ux Ns -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 c484e94a097..ee9a00ff080 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.47 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ssh-add.1,v 1.48 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -149,8 +149,8 @@ may be necessary to redirect the input from
 to make this work.)
 .It Ev SSH_AUTH_SOCK
 Identifies the path of a
-.Ux
-domain socket used to communicate with the agent.
+.Ux Ns -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 bbae4af92ae..acc115bd459 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.48 2009/10/22 12:35:53 sobrado Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.49 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -68,8 +68,8 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl a Ar bind_address
 Bind the agent to the
-.Ux
-domain socket
+.Ux Ns -domain
+socket
 .Ar bind_address .
 The default is
 .Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt .
@@ -165,8 +165,8 @@ 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
-.Ux
-domain socket is created and the name of this socket is stored in the
+.Ux Ns -domain
+socket is created and the name of this socket is stored in the
 .Ev SSH_AUTH_SOCK
 environment
 variable.
@@ -189,9 +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
-.Ux
-domain sockets used to contain the connection to the
-authentication agent.
+.Ux Ns -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.
 .El
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 9aca407a522..7e7f64e46dd 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -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.
 .\"
-.\" $OpenBSD: ssh.1,v 1.285 2009/10/22 12:35:53 sobrado Exp $
+.\" $OpenBSD: ssh.1,v 1.286 2009/10/22 15:02:12 sobrado Exp $
 .Dd $Mdocdate: October 22 2009 $
 .Dt SSH 1
 .Os
@@ -133,8 +133,8 @@ This can also be specified on a per-host basis in a configuration file.
 Agent forwarding should be enabled with caution.
 Users with the ability to bypass file permissions on the remote host
 (for the agent's
-.Ux
-domain socket) can access the local agent through the forwarded connection.
+.Ux Ns -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.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index abfd786cf5d..f97eb0cea35 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.8,v 1.33 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: apm.8,v 1.34 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 John T. Kohl
 .\" All rights reserved.
@@ -139,8 +139,8 @@ until the system resumes from its sleep state.
 .Bl -tag -width /var/run/apmdev -compact
 .It Pa /var/run/apmdev
 default
-.Ux
-domain socket for communicating with
+.Ux Ns -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 2d59353a0eb..0951d3ac48a 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apmd.8,v 1.40 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: apmd.8,v 1.41 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 1995 John T. Kohl
 .\" All rights reserved.
@@ -192,8 +192,8 @@ powerdown.
 .Pp
 .It /var/run/apmdev
 Default
-.Ux
-domain socket used for communication with
+.Ux Ns -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 3ca217c4720..f903319bd12 100644
--- a/usr.sbin/dvmrpctl/dvmrpctl.8
+++ b/usr.sbin/dvmrpctl/dvmrpctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpctl.8,v 1.5 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: dvmrpctl.8,v 1.6 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
 .\"
@@ -56,8 +56,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/dvmrpd.sockXX" -compact
 .It /var/run/dvmrpd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 2c4af546a8d..e9761125ff7 100644
--- a/usr.sbin/dvmrpd/dvmrpd.8
+++ b/usr.sbin/dvmrpd/dvmrpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpd.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: dvmrpd.8,v 1.7 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
 .\"
@@ -101,8 +101,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/dvmrpd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 f5896a36c17..9d413657d71 100644
--- a/usr.sbin/ospf6ctl/ospf6ctl.8
+++ b/usr.sbin/ospf6ctl/ospf6ctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6ctl.8,v 1.3 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ospf6ctl.8,v 1.4 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -106,8 +106,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/ospf6d.sockXX" -compact
 .It /var/run/ospf6d.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 5062aa3446f..d2e70bcaf5b 100644
--- a/usr.sbin/ospf6d/ospf6d.8
+++ b/usr.sbin/ospf6d/ospf6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.8,v 1.9 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ospf6d.8,v 1.10 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -154,8 +154,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ospf6d.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 d74fbf26081..13641715ce0 100644
--- a/usr.sbin/ospfctl/ospfctl.8
+++ b/usr.sbin/ospfctl/ospfctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfctl.8,v 1.21 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ospfctl.8,v 1.22 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
 .\"
@@ -119,8 +119,8 @@ Show summary information.
 .Sh FILES
 .Bl -tag -width "/var/run/ospfd.sockXX" -compact
 .It /var/run/ospfd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 840f9f70f78..d8fb495d35f 100644
--- a/usr.sbin/ospfd/ospfd.8
+++ b/usr.sbin/ospfd/ospfd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.8,v 1.24 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ospfd.8,v 1.25 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -156,8 +156,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ospfd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -domain
+socket used for communication with
 .Xr ospfctl 8 .
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/relayctl/relayctl.8 b/usr.sbin/relayctl/relayctl.8
index 0aab2d81b7e..7de530474de 100644
--- a/usr.sbin/relayctl/relayctl.8
+++ b/usr.sbin/relayctl/relayctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: relayctl.8,v 1.25 2009/10/22 12:35:53 sobrado Exp $
+.\" $OpenBSD: relayctl.8,v 1.26 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -98,8 +98,8 @@ again.
 .Sh FILES
 .Bl -tag -width "/var/run/relayd.sockXX" -compact
 .It /var/run/relayd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 44394789f44..3d121776911 100644
--- a/usr.sbin/relayd/relayd.8
+++ b/usr.sbin/relayd/relayd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.8,v 1.19 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: relayd.8,v 1.20 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -128,8 +128,8 @@ Produce more verbose output.
 .It /etc/relayd.conf
 Default configuration file.
 .It /var/run/relayd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 d39f0269120..5b60ef1a8a4 100644
--- a/usr.sbin/ripctl/ripctl.8
+++ b/usr.sbin/ripctl/ripctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripctl.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ripctl.8,v 1.7 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -75,8 +75,8 @@ Show the Routing Information Base.
 .Sh FILES
 .Bl -tag -width "/var/run/ripd.sockXX" -compact
 .It /var/run/ripd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 8d517c6b7c2..7c8651bf663 100644
--- a/usr.sbin/ripd/ripd.8
+++ b/usr.sbin/ripd/ripd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.8,v 1.6 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: ripd.8,v 1.7 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -72,8 +72,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/ripd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 1261a81635f..9a862d6f2f4 100644
--- a/usr.sbin/smtpd/smtpctl.8
+++ b/usr.sbin/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.9 2009/10/22 12:35:53 sobrado Exp $
+.\" $OpenBSD: smtpctl.8,v 1.10 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -63,8 +63,8 @@ Displays runtime statistics concerning
 .Sh FILES
 .Bl -tag -width "/var/run/smtpd.sockXX" -compact
 .It /var/run/smtpd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 106563119dd..7f2b7e309e2 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.10 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: smtpd.8,v 1.11 2009/10/22 15:02:12 sobrado Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -109,8 +109,8 @@ Default
 .Nm
 configuration file.
 .It /var/run/smtpd.sock
-.Ux
-domain socket used for communication with
+.Ux Ns -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 911374a68f7..075c0ed6d7d 100644
--- a/usr.sbin/snmpctl/snmpctl.8
+++ b/usr.sbin/snmpctl/snmpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpctl.8,v 1.10 2009/10/22 12:35:53 sobrado Exp $
+.\" $OpenBSD: snmpctl.8,v 1.11 2009/10/22 15:02:13 sobrado Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -106,8 +106,8 @@ An string describing an Object ID, for example
 .Bl -tag -width "/var/run/snmpd.sockXX" -compact
 .It /var/run/snmpd.sock
 default
-.Ux
-domain socket used for communication with
+.Ux Ns -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 97bd2e7e46e..90dc3896132 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslogd.8,v 1.25 2009/10/22 12:35:53 sobrado Exp $
+.\"	$OpenBSD: syslogd.8,v 1.26 2009/10/22 15:02:13 sobrado Exp $
 .\"
 .\" Copyright (c) 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -124,8 +124,8 @@ 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
-.Ux
-domain socket
+.Ux Ns -domain
+socket
 .Pa /dev/log ,
 and from the special device
 .Pa /dev/klog
@@ -157,8 +157,8 @@ process ID of current
 .Nm syslogd
 .It Pa /dev/log
 name of the
-.Ux
-domain datagram log socket
+.Ux Ns -domain
+datagram log socket
 .It Pa /dev/klog
 kernel log device
 .El