2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a34ec1813..4657b19eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
      [ssh.1]
      ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via
      Debian.  ok djm@
+   - dtucker@cvs.openbsd.org 2004/05/02 23:02:17
+     [sftp.1]
+     ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@
 
 20040423
  - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1067,4 +1070,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.3339 2004/05/02 12:15:52 dtucker Exp $
+$Id: ChangeLog,v 1.3340 2004/05/02 23:13:15 dtucker Exp $
diff --git a/sftp.1 b/sftp.1
index c8ba85751..795a0342f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.53 2004/04/28 07:13:42 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.54 2004/05/02 23:02:17 dtucker Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -153,7 +153,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