summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.14
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 @@
22 [sshd.8] 22 [sshd.8]
23 Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk 23 Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk
24 via Debian; ok djm@ 24 via Debian; ok djm@
25 - dtucker@cvs.openbsd.org 2004/05/02 11:57:52
26 [ssh.1]
27 ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via
28 Debian. ok djm@
25 29
2620040423 3020040423
27 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno 31 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
@@ -1063,4 +1067,4 @@
1063 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1067 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1064 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1068 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1065 1069
1066$Id: ChangeLog,v 1.3338 2004/05/02 12:15:08 dtucker Exp $ 1070$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 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.184 2004/04/28 07:13:42 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.185 2004/05/02 11:57:52 dtucker Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -618,7 +618,7 @@ For full details of the options listed below, and their possible values, see
618.It Compression 618.It Compression
619.It CompressionLevel 619.It CompressionLevel
620.It ConnectionAttempts 620.It ConnectionAttempts
621.It ConnectionTimeout 621.It ConnectTimeout
622.It DynamicForward 622.It DynamicForward
623.It EscapeChar 623.It EscapeChar
624.It ForwardAgent 624.It ForwardAgent