2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ebc93b69..a34ec1813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
      [sshd.8]
      Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk
      via Debian; ok djm@
+   - dtucker@cvs.openbsd.org 2004/05/02 11:57:52
+     [ssh.1]
+     ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via
+     Debian.  ok djm@
 
 20040423
  - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1063,4 +1067,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.3338 2004/05/02 12:15:08 dtucker Exp $
+$Id: ChangeLog,v 1.3339 2004/05/02 12:15:52 dtucker Exp $
diff --git a/ssh.1 b/ssh.1
index d387cc884..b7b126440 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.184 2004/04/28 07:13:42 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.185 2004/05/02 11:57:52 dtucker Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -618,7 +618,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 DynamicForward
 .It EscapeChar
 .It ForwardAgent