merged OpenSSH 4.2p1 to trunk

[gssapi-openssh.git] / openssh / sshd_config

diff --git a/openssh/sshd_config b/openssh/sshd_config
index 338f6c1e9e4e242d2d946f4221a5259bb8eb0d25..4521084eb3560cdb5464f7bd5dd23fc5356fbecf 100644 (file)
--- a/openssh/sshd_config
+++ b/openssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.70 2004/12/23 23:11:00 djm Exp $
+#      $OpenBSD: sshd_config,v 1.72 2005/07/25 11:59:40 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -27,7 +27,7 @@
 #ServerKeyBits 768
 
 # Logging
-#obsoletes QuietMode and FascistLogging
+# obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
 #LogLevel INFO
 
@@ -95,7 +95,7 @@
 #UseLogin no
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no
-#Compression yes
+#Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
 #UseDNS yes