- (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by

[openssh.git] / ssh_config

diff --git a/ssh_config b/ssh_config
index a8a8d72abfc644e8a49888e0fe38754e889bdebc..f41bee0a2ed391d6955e830e97f27e85e2c72723 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -1,9 +1,9 @@
-#      $OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
+#      $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
 
-# This is the ssh client system-wide configuration file.  See ssh(1)
-# for more information.  This file provides defaults for users, and
-# the values can be changed in per-user configuration files or on the
-# command line.
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
 
 # Configuration data is parsed as follows:
 #  1. command line options
@@ -13,19 +13,21 @@
 # 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
 #   ForwardX11 no
-#   RhostsAuthentication yes
-#   RhostsRSAAuthentication yes
+#   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
-#   FallBackToRsh no
-#   UseRsh no
+#   HostbasedAuthentication no
 #   BatchMode no
 #   CheckHostIP yes
+#   AddressFamily any
+#   ConnectTimeout 0
 #   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity
 #   IdentityFile ~/.ssh/id_rsa