diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /ssh-agent.1 | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index 226804e5f..741cf4bd1 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.41 2004/07/11 17:48:47 deraadt Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.42 2005/04/21 06:17:50 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -111,10 +111,10 @@ Keys are added using | |||
111 | When executed without arguments, | 111 | When executed without arguments, |
112 | .Xr ssh-add 1 | 112 | .Xr ssh-add 1 |
113 | adds the files | 113 | adds the files |
114 | .Pa $HOME/.ssh/id_rsa , | 114 | .Pa ~/.ssh/id_rsa , |
115 | .Pa $HOME/.ssh/id_dsa | 115 | .Pa ~/.ssh/id_dsa |
116 | and | 116 | and |
117 | .Pa $HOME/.ssh/identity . | 117 | .Pa ~/.ssh/identity . |
118 | If the identity has a passphrase, | 118 | If the identity has a passphrase, |
119 | .Xr ssh-add 1 | 119 | .Xr ssh-add 1 |
120 | asks for the passphrase (using a small X11 application if running | 120 | asks for the passphrase (using a small X11 application if running |
@@ -179,11 +179,11 @@ The agent exits automatically when the command given on the command | |||
179 | line terminates. | 179 | line terminates. |
180 | .Sh FILES | 180 | .Sh FILES |
181 | .Bl -tag -width Ds | 181 | .Bl -tag -width Ds |
182 | .It Pa $HOME/.ssh/identity | 182 | .It Pa ~/.ssh/identity |
183 | Contains the protocol version 1 RSA authentication identity of the user. | 183 | Contains the protocol version 1 RSA authentication identity of the user. |
184 | .It Pa $HOME/.ssh/id_dsa | 184 | .It Pa ~/.ssh/id_dsa |
185 | Contains the protocol version 2 DSA authentication identity of the user. | 185 | Contains the protocol version 2 DSA authentication identity of the user. |
186 | .It Pa $HOME/.ssh/id_rsa | 186 | .It Pa ~/.ssh/id_rsa |
187 | Contains the protocol version 2 RSA authentication identity of the user. | 187 | Contains the protocol version 2 RSA authentication identity of the user. |
188 | .It Pa /tmp/ssh-XXXXXXXX/agent.<ppid> | 188 | .It Pa /tmp/ssh-XXXXXXXX/agent.<ppid> |
189 | Unix-domain sockets used to contain the connection to the | 189 | Unix-domain sockets used to contain the connection to the |