summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.14
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4657b19eb..d601594f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 - dtucker@cvs.openbsd.org 2004/05/02 23:02:17 29 - dtucker@cvs.openbsd.org 2004/05/02 23:02:17
30 [sftp.1] 30 [sftp.1]
31 ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@ 31 ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@
32 - dtucker@cvs.openbsd.org 2004/05/02 23:17:51
33 [scp.1]
34 ConnectionTimeout -> ConnectTimeout for scp.1 too.
32 35
3320040423 3620040423
34 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno 37 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1070,4 +1073,4 @@
1070 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1073 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1071 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1074 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1072 1075
1073$Id: ChangeLog,v 1.3340 2004/05/02 23:13:15 dtucker Exp $ 1076$Id: ChangeLog,v 1.3341 2004/05/02 23:19:03 dtucker Exp $
diff --git a/scp.1 b/scp.1
index 5a3221127..62e08ffae 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.33 2004/03/05 10:53:58 markus Exp $ 12.\" $OpenBSD: scp.1,v 1.34 2004/05/02 23:17:51 dtucker Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -127,7 +127,7 @@ For full details of the options listed below, and their possible values, see
127.It Compression 127.It Compression
128.It CompressionLevel 128.It CompressionLevel
129.It ConnectionAttempts 129.It ConnectionAttempts
130.It ConnectionTimeout 130.It ConnectTimeout
131.It GlobalKnownHostsFile 131.It GlobalKnownHostsFile
132.It GSSAPIAuthentication 132.It GSSAPIAuthentication
133.It GSSAPIDelegateCredentials 133.It GSSAPIDelegateCredentials