diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
tree | f64a4ace625514e94759878c0b94ab0a79805bbd /sftp.1 | |
parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'sftp.1')
-rw-r--r-- | sftp.1 | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.63 2006/01/20 00:14:55 dtucker Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -78,7 +78,7 @@ to start in a remote directory. | |||
78 | The final usage format allows for automated sessions using the | 78 | The final usage format allows for automated sessions using the |
79 | .Fl b | 79 | .Fl b |
80 | option. | 80 | option. |
81 | In such cases, it is usually necessary to configure public key authentication | 81 | In such cases, it is necessary to configure non-interactive authentication |
82 | to obviate the need to enter a password at connection time (see | 82 | to obviate the need to enter a password at connection time (see |
83 | .Xr sshd 8 | 83 | .Xr sshd 8 |
84 | and | 84 | and |
@@ -180,6 +180,7 @@ For full details of the options listed below, and their possible values, see | |||
180 | .It Protocol | 180 | .It Protocol |
181 | .It ProxyCommand | 181 | .It ProxyCommand |
182 | .It PubkeyAuthentication | 182 | .It PubkeyAuthentication |
183 | .It RekeyLimit | ||
183 | .It RhostsRSAAuthentication | 184 | .It RhostsRSAAuthentication |
184 | .It RSAAuthentication | 185 | .It RSAAuthentication |
185 | .It SendEnv | 186 | .It SendEnv |