diff options
author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /ssh.0 | |
parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'ssh.0')
-rw-r--r-- | ssh.0 | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -374,6 +374,7 @@ DESCRIPTION | |||
374 | HostKeyAlias | 374 | HostKeyAlias |
375 | HostName | 375 | HostName |
376 | IdentityFile | 376 | IdentityFile |
377 | IdentitiesOnly | ||
377 | LocalForward | 378 | LocalForward |
378 | LogLevel | 379 | LogLevel |
379 | MACs | 380 | MACs |
@@ -665,4 +666,4 @@ AUTHORS | |||
665 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 666 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
666 | versions 1.5 and 2.0. | 667 | versions 1.5 and 2.0. |
667 | 668 | ||
668 | OpenBSD 3.4 September 25, 1999 11 | 669 | OpenBSD 3.5 September 25, 1999 11 |