diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:09 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-02-29 12:35:08 +0000 |
commit | 5a19d59c0b76162929545ad1bc92e7de69ce9a7b (patch) | |
tree | 72fa0d1f85b6a2a4a447bc6a756e48be37a79cb9 /ssh-keygen.1 | |
parent | 88659ca2f10e2401f887b9dd58f6361d7bfa08e4 (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 37a4fc2b2..24bed5f61 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -178,9 +178,7 @@ key in | |||
178 | .Pa ~/.ssh/id_ed25519 | 178 | .Pa ~/.ssh/id_ed25519 |
179 | or | 179 | or |
180 | .Pa ~/.ssh/id_rsa . | 180 | .Pa ~/.ssh/id_rsa . |
181 | Additionally, the system administrator may use this to generate host keys, | 181 | Additionally, the system administrator may use this to generate host keys. |
182 | as seen in | ||
183 | .Pa /etc/rc . | ||
184 | .Pp | 182 | .Pp |
185 | Normally this program generates the key and asks for a file in which | 183 | Normally this program generates the key and asks for a file in which |
186 | to store the private key. | 184 | to store the private key. |
@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) | |||
227 | for which host keys | 225 | for which host keys |
228 | do not exist, generate the host keys with the default key file path, | 226 | do not exist, generate the host keys with the default key file path, |
229 | an empty passphrase, default bits for the key type, and default comment. | 227 | an empty passphrase, default bits for the key type, and default comment. |
230 | This is used by | 228 | This is used by system administration scripts to generate new host keys. |
231 | .Pa /etc/rc | ||
232 | to generate new host keys. | ||
233 | .It Fl a Ar rounds | 229 | .It Fl a Ar rounds |
234 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol | 230 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol |
235 | 2 key when the | 231 | 2 key when the |
@@ -642,7 +638,7 @@ option. | |||
642 | Valid generator values are 2, 3, and 5. | 638 | Valid generator values are 2, 3, and 5. |
643 | .Pp | 639 | .Pp |
644 | Screened DH groups may be installed in | 640 | Screened DH groups may be installed in |
645 | .Pa /etc/moduli . | 641 | .Pa /etc/ssh/moduli . |
646 | It is important that this file contains moduli of a range of bit lengths and | 642 | It is important that this file contains moduli of a range of bit lengths and |
647 | that both ends of a connection share common moduli. | 643 | that both ends of a connection share common moduli. |
648 | .Sh CERTIFICATES | 644 | .Sh CERTIFICATES |
@@ -841,7 +837,7 @@ on all machines | |||
841 | where the user wishes to log in using public key authentication. | 837 | where the user wishes to log in using public key authentication. |
842 | There is no need to keep the contents of this file secret. | 838 | There is no need to keep the contents of this file secret. |
843 | .Pp | 839 | .Pp |
844 | .It Pa /etc/moduli | 840 | .It Pa /etc/ssh/moduli |
845 | Contains Diffie-Hellman groups used for DH-GEX. | 841 | Contains Diffie-Hellman groups used for DH-GEX. |
846 | The file format is described in | 842 | The file format is described in |
847 | .Xr moduli 5 . | 843 | .Xr moduli 5 . |