diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /scp.1 | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'scp.1')
-rw-r--r-- | scp.1 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,9 +9,9 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ | 12 | .\" $OpenBSD: scp.1,v 1.50 2010/02/08 10:50:20 markus Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd $Mdocdate: July 12 2008 $ | 14 | .Dd $Mdocdate: February 8 2010 $ |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
16 | .Os | 16 | .Os |
17 | .Sh NAME | 17 | .Sh NAME |
@@ -153,6 +153,7 @@ For full details of the options listed below, and their possible values, see | |||
153 | .It NoHostAuthenticationForLocalhost | 153 | .It NoHostAuthenticationForLocalhost |
154 | .It NumberOfPasswordPrompts | 154 | .It NumberOfPasswordPrompts |
155 | .It PasswordAuthentication | 155 | .It PasswordAuthentication |
156 | .It PKCS11Provider | ||
156 | .It Port | 157 | .It Port |
157 | .It PreferredAuthentications | 158 | .It PreferredAuthentications |
158 | .It Protocol | 159 | .It Protocol |
@@ -164,7 +165,6 @@ For full details of the options listed below, and their possible values, see | |||
164 | .It SendEnv | 165 | .It SendEnv |
165 | .It ServerAliveInterval | 166 | .It ServerAliveInterval |
166 | .It ServerAliveCountMax | 167 | .It ServerAliveCountMax |
167 | .It SmartcardDevice | ||
168 | .It StrictHostKeyChecking | 168 | .It StrictHostKeyChecking |
169 | .It TCPKeepAlive | 169 | .It TCPKeepAlive |
170 | .It UsePrivilegedPort | 170 | .It UsePrivilegedPort |