summaryrefslogtreecommitdiff
path: root/scp.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-06-15 10:34:08 +1000
committerDamien Miller <djm@mindrot.org>2004-06-15 10:34:08 +1000
commit0e220dbfbcc9fe252e8f1f4890dbfa415aad35db (patch)
treeb78bab0c628cd5bdb0ec95340f533a1be2fae75f /scp.1
parent05202ffe214115afa24bf6e7a6d8c8457e6759bb (diff)
- 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 'scp.1')
-rw-r--r--scp.14
1 files changed, 3 insertions, 1 deletions
diff --git a/scp.1 b/scp.1
index 202ebaad..f346b2ae 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.35 2004/05/04 18:36:07 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.36 2004/06/13 15:03:02 djm Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -128,6 +128,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