diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
| commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
| tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /ssh_config.0 | |
| parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
| parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) | |
merge 5.5p1
Diffstat (limited to 'ssh_config.0')
| -rw-r--r-- | ssh_config.0 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh_config.0 b/ssh_config.0 index 48969a22a..1a2c64ce1 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
| @@ -425,8 +425,8 @@ DESCRIPTION | |||
| 425 | Specifies the order in which the client should try protocol 2 au- | 425 | Specifies the order in which the client should try protocol 2 au- |
| 426 | thentication methods. This allows a client to prefer one method | 426 | thentication methods. This allows a client to prefer one method |
| 427 | (e.g. keyboard-interactive) over another method (e.g. password) | 427 | (e.g. keyboard-interactive) over another method (e.g. password) |
| 428 | The default for this option is: ``gssapi-with-mic,hostbased, | 428 | The default for this option is: ``gssapi-with- |
| 429 | publickey, keyboard-interactive, password''. | 429 | mic,hostbased,publickey,keyboard-interactive,password''. |
| 430 | 430 | ||
| 431 | Protocol | 431 | Protocol |
| 432 | Specifies the protocol versions ssh(1) should support in order of | 432 | Specifies the protocol versions ssh(1) should support in order of |
| @@ -673,4 +673,4 @@ AUTHORS | |||
| 673 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 673 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
| 674 | versions 1.5 and 2.0. | 674 | versions 1.5 and 2.0. |
| 675 | 675 | ||
| 676 | OpenBSD 4.6 March 5, 2010 11 | 676 | OpenBSD 4.7 March 26, 2010 11 |