Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/dist/ssh/Attic/ssh_config,v
retrieving revision 1.11
retrieving revision 1.14.12.1
diff -u -p -r1.11 -r1.14.12.1
--- src/crypto/dist/ssh/Attic/ssh_config	2006/02/04 22:32:14	1.11
+++ src/crypto/dist/ssh/Attic/ssh_config	2011/05/20 08:11:13	1.14.12.1
@@ -1,5 +1,5 @@
-#	$NetBSD: ssh_config,v 1.11 2006/02/04 22:32:14 christos Exp $
-#	$OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $
+#	$NetBSD: ssh_config,v 1.14.12.1 2011/05/20 08:11:13 matt Exp $
+#	$OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -25,6 +25,8 @@
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
 #   HostbasedAuthentication no
+#   GSSAPIAuthentication no
+#   GSSAPIDelegateCredentials no
 #   BatchMode no
 #   CheckHostIP yes
 #   AddressFamily any
@@ -37,7 +39,10 @@
 #   Protocol 2,1
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   MACs hmac-md5,hmac-sha1,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+# If you use xorg from pkgsrc then uncomment the following line.
+#   XAuthLocation /usr/pkg/bin/xauth