diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
| commit | 983ad11a1c78949e86a0f51f51ef0d614cc5e665 (patch) | |
| tree | 7d41ca8690f59b7463bd4d5fefde78dac8a00e60 /crypto/openssh/ssh_config | |
| parent | 3c5bc6b274083ffa3a7aa67e87c8936a1778eff5 (diff) | |
| download | FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.zip FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh_config')
| -rw-r--r-- | crypto/openssh/ssh_config | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 0b11c8a..c1234d1 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/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.20 2005/01/28 09:45:53 dtucker Exp $ # $FreeBSD$ # This is the ssh client system-wide configuration file. See @@ -14,7 +14,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 @@ -36,4 +38,4 @@ # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # EscapeChar ~ -# VersionAddendum FreeBSD-20041028 +# VersionAddendum FreeBSD-20050605 |
