no derived files in cvs

[gssapi-openssh.git] / openssh / ssh_config

diff --git a/openssh/ssh_config b/openssh/ssh_config
index 2692e89137ea018596bd0a528b3137c087caff09..177521caaa115caeea1d07df26c93ebc0a778091 100644 (file)
--- a/openssh/ssh_config
+++ b/openssh/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
+#      $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -13,7 +13,9 @@
 # Thus, host-specific definitions should be at the beginning of the
 # configuration file, and defaults at the end.
 
-# Site-wide defaults for various options
+# Site-wide defaults for some commonly used options.  For a comprehensive
+# list of available options, their meanings and defaults, please see the
+# ssh_config(5) man page.
 
 # Host *
 #   ForwardAgent no
@@ -22,6 +24,8 @@
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
 #   HostbasedAuthentication no
+#   GSSAPIAuthentication no
+#   GSSAPIDelegateCredentials no
 #   BatchMode no
 #   CheckHostIP yes
 #   AddressFamily any
@@ -35,3 +39,6 @@
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~
+#   Tunnel no
+#   TunnelDevice any:any
+#   PermitLocalCommand no