diff options
author | Damien Miller <djm@mindrot.org> | 2010-01-26 12:51:13 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-01-26 12:51:13 +1100 |
commit | 2e68d793d6967e01faa9ead98b0e527bd19a8d16 (patch) | |
tree | af5c44527cf30feed8d97bfa8a2b2b85bf2eb68d /ssh-agent.1 | |
parent | 6761c7417d362fb8c0d71ddc60c3914f97e88c28 (diff) |
- tedu@cvs.openbsd.org 2010/01/17 21:49:09
[ssh-agent.1]
Correct and clarify ssh-add's password asking behavior.
Improved text dtucker and ok jmc
Diffstat (limited to 'ssh-agent.1')
-rw-r--r-- | ssh-agent.1 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index acc115bd4..f65e8e625 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.49 2009/10/22 15:02:12 sobrado Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.50 2010/01/17 21:49:09 tedu 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 |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .Dd $Mdocdate: October 22 2009 $ | 37 | .Dd $Mdocdate: January 17 2010 $ |
38 | .Dt SSH-AGENT 1 | 38 | .Dt SSH-AGENT 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -119,8 +119,9 @@ and | |||
119 | .Pa ~/.ssh/identity . | 119 | .Pa ~/.ssh/identity . |
120 | If the identity has a passphrase, | 120 | If the identity has a passphrase, |
121 | .Xr ssh-add 1 | 121 | .Xr ssh-add 1 |
122 | asks for the passphrase (using a small X11 application if running | 122 | asks for the passphrase on the terminal if it has one or from a small X11 |
123 | under X11, or from the terminal if running without X). | 123 | program if running under X11. |
124 | If neither of these is the case then the authentication will fail. | ||
124 | It then sends the identity to the agent. | 125 | It then sends the identity to the agent. |
125 | Several identities can be stored in the | 126 | Several identities can be stored in the |
126 | agent; the agent can automatically use any of these identities. | 127 | agent; the agent can automatically use any of these identities. |