summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.16
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6176bd89e..f3c804ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
32 - stevesk@cvs.openbsd.org 2011/03/23 16:50:04 32 - stevesk@cvs.openbsd.org 2011/03/23 16:50:04
33 [ssh-keygen.c] 33 [ssh-keygen.c]
34 remove -d, documentation removed >10 years ago; ok markus 34 remove -d, documentation removed >10 years ago; ok markus
35 - jmc@cvs.openbsd.org 2011/03/24 15:29:30
36 [ssh-keygen.1]
37 zap trailing whitespace;
35 38
3620110221 3920110221
37 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 40 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index e6c52ebe3..c9fec0403 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.103 2011/03/23 16:24:56 stevesk Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.104 2011/03/24 15:29:30 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: March 23 2011 $ 38.Dd $Mdocdate: March 24 2011 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -198,7 +198,7 @@ The options are as follows:
198For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys 198For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys
199do not exist, generate the host keys with the default key file path, 199do not exist, generate the host keys with the default key file path,
200an empty passphrase, default bits for the key type, and default comment. 200an empty passphrase, default bits for the key type, and default comment.
201This is used by 201This is used by
202.Pa /etc/rc 202.Pa /etc/rc
203to generate new host keys. 203to generate new host keys.
204.It Fl a Ar trials 204.It Fl a Ar trials