summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-05-03 09:13:15 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-05-03 09:13:15 +1000
commit3d5cbb77617483ba53694085630635c8ac26dd0a (patch)
treede8d7e105d543a899cff15b2523e08108165f8c8
parentedae0ec12a11c872b4fb5571c243be272e6065d6 (diff)
- dtucker@cvs.openbsd.org 2004/05/02 23:02:17
[sftp.1] ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@
-rw-r--r--ChangeLog5
-rw-r--r--sftp.14
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 @@
26 [ssh.1] 26 [ssh.1]
27 ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via 27 ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via
28 Debian. ok djm@ 28 Debian. ok djm@
29 - dtucker@cvs.openbsd.org 2004/05/02 23:02:17
30 [sftp.1]
31 ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@
29 32
3020040423 3320040423
31 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno 34 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1067,4 +1070,4 @@
1067 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1070 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1068 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1071 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1069 1072
1070$Id: ChangeLog,v 1.3339 2004/05/02 12:15:52 dtucker Exp $ 1073$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 @@
1.\" $OpenBSD: sftp.1,v 1.53 2004/04/28 07:13:42 jmc Exp $ 1.\" $OpenBSD: sftp.1,v 1.54 2004/05/02 23:02:17 dtucker Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -153,7 +153,7 @@ For full details of the options listed below, and their possible values, see
153.It Compression 153.It Compression
154.It CompressionLevel 154.It CompressionLevel
155.It ConnectionAttempts 155.It ConnectionAttempts
156.It ConnectionTimeout 156.It ConnectTimeout
157.It GlobalKnownHostsFile 157.It GlobalKnownHostsFile
158.It GSSAPIAuthentication 158.It GSSAPIAuthentication
159.It GSSAPIDelegateCredentials 159.It GSSAPIDelegateCredentials