port to OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / ssh_config

diff --git a/openssh/ssh_config b/openssh/ssh_config
index 62093545444b2107ae06c049ebd410ced40bf529..a8a8d72abfc644e8a49888e0fe38754e889bdebc 100644 (file)
--- a/openssh/ssh_config
+++ b/openssh/ssh_config
@@ -1,8 +1,9 @@
-#      $OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $
+#      $OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
 
-# This is ssh client systemwide 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(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.
 
 # Configuration data is parsed as follows:
 #  1. command line options
@@ -17,7 +18,7 @@
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
-#   RhostsAuthentication no
+#   RhostsAuthentication yes
 #   RhostsRSAAuthentication yes
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
@@ -25,11 +26,12 @@
 #   UseRsh no
 #   BatchMode no
 #   CheckHostIP yes
-#   StrictHostKeyChecking yes
+#   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity
-#   IdentityFile ~/.ssh/id_dsa
 #   IdentityFile ~/.ssh/id_rsa
+#   IdentityFile ~/.ssh/id_dsa
 #   Port 22
 #   Protocol 2,1
-#   Cipher blowfish
+#   Cipher 3des
+#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~