summaryrefslogtreecommitdiff
path: root/ssh-agent.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-03-08 11:51:22 +0000
commit46961f5704f8e86cea3e99253faad55aef4d8f35 (patch)
tree0dd97fa4fb649a62b4639fe2674380872b1f3e98 /ssh-agent.0
parentc753fe267efb1b027424fa8706cf0385fc3d14c1 (diff)
parent85e40e87a75fb80a0bf893ac05a417d6c353537d (diff)
New upstream release (7.2).
Diffstat (limited to 'ssh-agent.0')
-rw-r--r--ssh-agent.014
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0
index 65bf6e70f..2cc5ac6e0 100644
--- a/ssh-agent.0
+++ b/ssh-agent.0
@@ -18,10 +18,10 @@ DESCRIPTION
18 using ssh(1). 18 using ssh(1).
19 19
20 The agent initially does not have any private keys. Keys are added using 20 The agent initially does not have any private keys. Keys are added using
21 ssh-add(1). Multiple identities may be stored in ssh-agent concurrently 21 ssh(1) (see AddKeysToAgent in ssh_config(5) for details) or ssh-add(1).
22 and ssh(1) will automatically use them if present. ssh-add(1) is also 22 Multiple identities may be stored in ssh-agent concurrently and ssh(1)
23 used to remove keys from ssh-agent and to query the keys that are held in 23 will automatically use them if present. ssh-add(1) is also used to
24 one. 24 remove keys from ssh-agent and to query the keys that are held in one.
25 25
26 The options are as follows: 26 The options are as follows:
27 27
@@ -56,8 +56,8 @@ DESCRIPTION
56 for an identity with ssh-add(1) overrides this value. Without 56 for an identity with ssh-add(1) overrides this value. Without
57 this option the default maximum lifetime is forever. 57 this option the default maximum lifetime is forever.
58 58
59 If a commandline is given, this is executed as a subprocess of the agent. 59 If a command line is given, this is executed as a subprocess of the
60 When the command dies, so does the agent. 60 agent. When the command dies, so does the agent.
61 61
62 The idea is that the agent is run in the user's local PC, laptop, or 62 The idea is that the agent is run in the user's local PC, laptop, or
63 terminal. Authentication data need not be stored on any other machine, 63 terminal. Authentication data need not be stored on any other machine,
@@ -109,4 +109,4 @@ AUTHORS
109 created OpenSSH. Markus Friedl contributed the support for SSH protocol 109 created OpenSSH. Markus Friedl contributed the support for SSH protocol
110 versions 1.5 and 2.0. 110 versions 1.5 and 2.0.
111 111
112OpenBSD 5.8 April 24, 2015 OpenBSD 5.8 112OpenBSD 5.9 November 15, 2015 OpenBSD 5.9