diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /ssh-add.1 | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.56 2011/10/18 05:00:48 djm Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.58 2012/12/03 08:33:02 jmc 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 |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: October 18 2011 $ | 38 | .Dd $Mdocdate: December 3 2012 $ |
39 | .Dt SSH-ADD 1 | 39 | .Dt SSH-ADD 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -98,10 +98,10 @@ Deletes all identities from the agent. | |||
98 | Instead of adding identities, removes identities from the agent. | 98 | Instead of adding identities, removes identities from the agent. |
99 | If | 99 | If |
100 | .Nm | 100 | .Nm |
101 | has been run without arguments, the keys for the default identities will | 101 | has been run without arguments, the keys for the default identities and |
102 | be removed. | 102 | their corresponding certificates will be removed. |
103 | Otherwise, the argument list will be interpreted as a list of paths to | 103 | Otherwise, the argument list will be interpreted as a list of paths to |
104 | public key files and matching keys will be removed from the agent. | 104 | public key files to specify keys and certificates to be removed from the agent. |
105 | If no public key is found at a given path, | 105 | If no public key is found at a given path, |
106 | .Nm | 106 | .Nm |
107 | will append | 107 | will append |
@@ -111,8 +111,8 @@ and retry. | |||
111 | Remove keys provided by the PKCS#11 shared library | 111 | Remove keys provided by the PKCS#11 shared library |
112 | .Ar pkcs11 . | 112 | .Ar pkcs11 . |
113 | .It Fl k | 113 | .It Fl k |
114 | When loading keys into the agent, load plain private keys only and skip | 114 | When loading keys into or deleting keys from the agent, process plain private |
115 | certificates. | 115 | keys only and skip certificates. |
116 | .It Fl L | 116 | .It Fl L |
117 | Lists public key parameters of all identities currently represented | 117 | Lists public key parameters of all identities currently represented |
118 | by the agent. | 118 | by the agent. |