summaryrefslogtreecommitdiffstats
path: root/sftp.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-06-15 02:34:08 +0200
committerDamien Miller <djm@mindrot.org>2004-06-15 02:34:08 +0200
commit0e220dbfbcc9fe252e8f1f4890dbfa415aad35db (patch)
treeb78bab0c628cd5bdb0ec95340f533a1be2fae75f /sftp.1
parent - dtucker@cvs.openbsd.org 2004/06/13 14:01:42 (diff)
downloadopenssh-0e220dbfbcc9fe252e8f1f4890dbfa415aad35db.tar.xz
openssh-0e220dbfbcc9fe252e8f1f4890dbfa415aad35db.zip
- djm@cvs.openbsd.org 2004/06/13 15:03:02
[channels.c channels.h clientloop.c clientloop.h includes.h readconf.c] [readconf.h scp.1 sftp.1 ssh.1 ssh.c ssh_config.5] implement session multiplexing in the client (the server has supported this since 2.0); ok markus@
Diffstat (limited to 'sftp.1')
-rw-r--r--sftp.14
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.1 b/sftp.1
index 795a0342f..7f0ef1121 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.54 2004/05/02 23:02:17 dtucker Exp $
+.\" $OpenBSD: sftp.1,v 1.55 2004/06/13 15:03:02 djm Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -154,6 +154,8 @@ For full details of the options listed below, and their possible values, see
.It CompressionLevel
.It ConnectionAttempts
.It ConnectTimeout
+.It ControlMaster
+.It ControlPath
.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials