summaryrefslogtreecommitdiff
path: root/scp.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-12-17 16:31:10 +1100
committerDamien Miller <djm@mindrot.org>2003-12-17 16:31:10 +1100
commit12c150e7e0711e29ea5dc78d3c9ed46221319dc5 (patch)
tree71ac83ddc9424e406a2363c4985fdf67005d909e /scp.1
parent9836cf8d717455f1bba2dfbf2e41f074fc6bac48 (diff)
downloadopenssh-git-12c150e7e0711e29ea5dc78d3c9ed46221319dc5.tar.gz
- markus@cvs.openbsd.org 2003/12/09 21:53:37
[readconf.c readconf.h scp.1 servconf.c servconf.h sftp.1 ssh.1] [ssh_config.5 sshconnect.c sshd.c sshd_config.5] rename keepalive to tcpkeepalive; the old name causes too much confusion; ok djm, dtucker; with help from jmc@
Diffstat (limited to 'scp.1')
-rw-r--r--scp.14
1 files changed, 2 insertions, 2 deletions
diff --git a/scp.1 b/scp.1
index 4dab2a1d..cbebb949 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.30 2003/10/13 08:22:25 markus Exp $
+.\" $OpenBSD: scp.1,v 1.31 2003/12/09 21:53:36 markus Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -137,7 +137,6 @@ For full details of the options listed below, and their possible values, see
.It HostKeyAlias
.It HostName
.It IdentityFile
-.It KeepAlive
.It LogLevel
.It MACs
.It NoHostAuthenticationForLocalhost
@@ -152,6 +151,7 @@ For full details of the options listed below, and their possible values, see
.It RSAAuthentication
.It SmartcardDevice
.It StrictHostKeyChecking
+.It TCPKeepAlive
.It UsePrivilegedPort
.It User
.It UserKnownHostsFile