4 files changed, 19 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index ef05cbe35..34351d474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
      [ssh.1 ssh-agent.1 ssh-add.1]
      use the UNIX-related macros (.At and .Ux) where appropriate.
      ok jmc@
+   - sobrado@cvs.openbsd.org 2009/10/22 15:02:12
+     [ssh-agent.1 ssh-add.1 ssh.1]
+     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@
 
 20091011
  - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
diff --git a/ssh-add.1 b/ssh-add.1
index c484e94a0..ee9a00ff0 100644
--- a/ssh-add.1
+++ b/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/ssh-agent.1 b/ssh-agent.1
index bbae4af92..acc115bd4 100644
--- a/ssh-agent.1
+++ b/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/ssh.1 b/ssh.1
index 9aca407a5..7e7f64e46 100644
--- a/ssh.1
+++ b/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.