summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ac58a0eb3..bb15a0aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 [authfile.c channels.c compress.c packet.c sftp-server.c] 82 [authfile.c channels.c compress.c packet.c sftp-server.c]
83 [ssh-agent.c ssh-keygen.c] 83 [ssh-agent.c ssh-keygen.c]
84 remove unneeded casts and some char->u_char cleanup; ok markus@ 84 remove unneeded casts and some char->u_char cleanup; ok markus@
85 - stevesk@cvs.openbsd.org 2002/01/03 04:11:08
86 [ssh_config]
87 grammar in comment
85 88
86 89
8720020121 9020020121
@@ -7230,4 +7233,4 @@
7230 - Wrote replacements for strlcpy and mkdtemp 7233 - Wrote replacements for strlcpy and mkdtemp
7231 - Released 1.0pre1 7234 - Released 1.0pre1
7232 7235
7233$Id: ChangeLog,v 1.1746 2002/01/22 12:18:15 djm Exp $ 7236$Id: ChangeLog,v 1.1747 2002/01/22 12:18:32 djm Exp $
diff --git a/ssh_config b/ssh_config
index 620935454..7d1b21067 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,8 +1,9 @@
1# $OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $ 1# $OpenBSD: ssh_config,v 1.11 2002/01/03 04:11:08 stevesk Exp $
2 2
3# This is ssh client systemwide configuration file. See ssh(1) for more 3# This is the ssh client system-wide configuration file. See ssh(1)
4# information. This file provides defaults for users, and the values can 4# for more information. This file provides defaults for users, and
5# be changed in per-user configuration files or on the command line. 5# the values can be changed in per-user configuration files or on the
6# command line.
6 7
7# Configuration data is parsed as follows: 8# Configuration data is parsed as follows:
8# 1. command line options 9# 1. command line options