summaryrefslogtreecommitdiff
path: root/sftp.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /sftp.0
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'sftp.0')
-rw-r--r--sftp.04
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.0 b/sftp.0
index f29776701..8350732d4 100644
--- a/sftp.0
+++ b/sftp.0
@@ -103,6 +103,7 @@ DESCRIPTION
103 ConnectTimeout 103 ConnectTimeout
104 ControlMaster 104 ControlMaster
105 ControlPath 105 ControlPath
106 ControlPersist
106 GlobalKnownHostsFile 107 GlobalKnownHostsFile
107 GSSAPIAuthentication 108 GSSAPIAuthentication
108 GSSAPIDelegateCredentials 109 GSSAPIDelegateCredentials
@@ -115,6 +116,7 @@ DESCRIPTION
115 IdentityFile 116 IdentityFile
116 IdentitiesOnly 117 IdentitiesOnly
117 IPQoS 118 IPQoS
119 KbdInteractiveAuthentication
118 KbdInteractiveDevices 120 KbdInteractiveDevices
119 KexAlgorithms 121 KexAlgorithms
120 LogLevel 122 LogLevel
@@ -334,4 +336,4 @@ SEE ALSO
334 draft-ietf-secsh-filexfer-00.txt, January 2001, work in progress 336 draft-ietf-secsh-filexfer-00.txt, January 2001, work in progress
335 material. 337 material.
336 338
337OpenBSD 5.0 August 7, 2011 OpenBSD 5.0 339OpenBSD 5.0 September 5, 2011 OpenBSD 5.0