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 @@
    - dtucker@cvs.openbsd.org 2004/05/02 23:02:17
      [sftp.1]
      ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@
+   - dtucker@cvs.openbsd.org 2004/05/02 23:17:51
+     [scp.1]
+     ConnectionTimeout -> ConnectTimeout for scp.1 too.
 
 20040423
  - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1070,4 +1073,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3340 2004/05/02 23:13:15 dtucker Exp $
+$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 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.33 2004/03/05 10:53:58 markus Exp $
+.\" $OpenBSD: scp.1,v 1.34 2004/05/02 23:17:51 dtucker Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -127,7 +127,7 @@ For full details of the options listed below, and their possible values, see
 .It Compression
 .It CompressionLevel
 .It ConnectionAttempts
-.It ConnectionTimeout
+.It ConnectTimeout
 .It GlobalKnownHostsFile
 .It GSSAPIAuthentication
 .It GSSAPIDelegateCredentials