diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
| commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
| tree | 86848a7668424b392d48791a0e41e05f9df7b62b /ssh-keygen.0 | |
| parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
| parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) | |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'ssh-keygen.0')
| -rw-r--r-- | ssh-keygen.0 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.0 b/ssh-keygen.0 index a69b37d67..c43678ff0 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 | |||
| @@ -4,7 +4,7 @@ NAME | |||
| 4 | ssh-keygen - authentication key generation, management and conversion | 4 | ssh-keygen - authentication key generation, management and conversion |
| 5 | 5 | ||
| 6 | SYNOPSIS | 6 | SYNOPSIS |
| 7 | ssh-keygen [-q] [-b bits] -t type [-N new_passphrase] [-C comment] | 7 | ssh-keygen [-q] [-b bits] [-t type] [-N new_passphrase] [-C comment] |
| 8 | [-f output_keyfile] | 8 | [-f output_keyfile] |
| 9 | ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile] | 9 | ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile] |
| 10 | ssh-keygen -i [-m key_format] [-f input_keyfile] | 10 | ssh-keygen -i [-m key_format] [-f input_keyfile] |
| @@ -559,4 +559,4 @@ AUTHORS | |||
| 559 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 559 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
| 560 | versions 1.5 and 2.0. | 560 | versions 1.5 and 2.0. |
| 561 | 561 | ||
| 562 | OpenBSD 5.4 December 21, 2013 OpenBSD 5.4 | 562 | OpenBSD 5.5 February 5, 2014 OpenBSD 5.5 |