diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:09 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-09-08 14:50:02 +0100 |
commit | 5399167019a01a47c5208b0f8a6f0600b9af3bd5 (patch) | |
tree | 4a8e35153bbc1953ea9e6d15ca462bbdf6b5f6c6 /ssh-keygen.1 | |
parent | 5919db7dc21a34c31be70170728c2838ff59b740 (diff) |
Adjust various OpenBSD-specific references in manual pages
No single bug reference for this patch, but history includes:
http://bugs.debian.org/154434 (login.conf(5))
http://bugs.debian.org/513417 (/etc/rc)
http://bugs.debian.org/530692 (ssl(8))
https://bugs.launchpad.net/bugs/456660 (ssl(8))
Forwarded: not-needed
Last-Update: 2014-10-07
Patch-Name: openbsd-docs.patch
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 9b93666c9..19bed1e34 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -174,9 +174,7 @@ key in | |||
174 | .Pa ~/.ssh/id_ed25519 | 174 | .Pa ~/.ssh/id_ed25519 |
175 | or | 175 | or |
176 | .Pa ~/.ssh/id_rsa . | 176 | .Pa ~/.ssh/id_rsa . |
177 | Additionally, the system administrator may use this to generate host keys, | 177 | Additionally, the system administrator may use this to generate host keys. |
178 | as seen in | ||
179 | .Pa /etc/rc . | ||
180 | .Pp | 178 | .Pp |
181 | Normally this program generates the key and asks for a file in which | 179 | Normally this program generates the key and asks for a file in which |
182 | to store the private key. | 180 | to store the private key. |
@@ -223,9 +221,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) | |||
223 | for which host keys | 221 | for which host keys |
224 | do not exist, generate the host keys with the default key file path, | 222 | do not exist, generate the host keys with the default key file path, |
225 | an empty passphrase, default bits for the key type, and default comment. | 223 | an empty passphrase, default bits for the key type, and default comment. |
226 | This is used by | 224 | This is used by system administration scripts to generate new host keys. |
227 | .Pa /etc/rc | ||
228 | to generate new host keys. | ||
229 | .It Fl a Ar rounds | 225 | .It Fl a Ar rounds |
230 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol | 226 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol |
231 | 2 key when the | 227 | 2 key when the |
@@ -638,7 +634,7 @@ option. | |||
638 | Valid generator values are 2, 3, and 5. | 634 | Valid generator values are 2, 3, and 5. |
639 | .Pp | 635 | .Pp |
640 | Screened DH groups may be installed in | 636 | Screened DH groups may be installed in |
641 | .Pa /etc/moduli . | 637 | .Pa /etc/ssh/moduli . |
642 | It is important that this file contains moduli of a range of bit lengths and | 638 | It is important that this file contains moduli of a range of bit lengths and |
643 | that both ends of a connection share common moduli. | 639 | that both ends of a connection share common moduli. |
644 | .Sh CERTIFICATES | 640 | .Sh CERTIFICATES |
@@ -837,7 +833,7 @@ on all machines | |||
837 | where the user wishes to log in using public key authentication. | 833 | where the user wishes to log in using public key authentication. |
838 | There is no need to keep the contents of this file secret. | 834 | There is no need to keep the contents of this file secret. |
839 | .Pp | 835 | .Pp |
840 | .It Pa /etc/moduli | 836 | .It Pa /etc/ssh/moduli |
841 | Contains Diffie-Hellman groups used for DH-GEX. | 837 | Contains Diffie-Hellman groups used for DH-GEX. |
842 | The file format is described in | 838 | The file format is described in |
843 | .Xr moduli 5 . | 839 | .Xr moduli 5 . |