summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:16:27 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:16:27 +1100
commit83d0d39d0e30d545d9caa94089b92739a479dff1 (patch)
tree1bb65af061cd98806774941936c083c64c4388bd
parentc7e2d3fa1049c13d33d043e15c524f19e2791586 (diff)
- jmc@cvs.openbsd.org 2005/10/31 19:55:25
[ssh-keygen.1] grammar;
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.14
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ebe18efc..e4f703fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,9 @@
87 SIGINT or SIGQUIT when running without privilege separation (the 87 SIGINT or SIGQUIT when running without privilege separation (the
88 normal privsep case is already OK). Patch mainly by dtucker@ and 88 normal privsep case is already OK). Patch mainly by dtucker@ and
89 senthilkumar_sen AT hotpop.com; ok dtucker@ 89 senthilkumar_sen AT hotpop.com; ok dtucker@
90 - jmc@cvs.openbsd.org 2005/10/31 19:55:25
91 [ssh-keygen.1]
92 grammar;
90 93
9120051102 9420051102
92 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 95 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3220,4 +3223,4 @@
3220 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3223 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3221 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3224 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3222 3225
3223$Id: ChangeLog,v 1.3948 2005/11/05 04:16:12 djm Exp $ 3226$Id: ChangeLog,v 1.3949 2005/11/05 04:16:27 djm Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 2c952ba71..348a49ce2 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.70 2005/10/31 11:12:49 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.71 2005/10/31 19:55:25 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -120,7 +120,7 @@ The type of key to be generated is specified with the
120option. 120option.
121If invoked without any arguments, 121If invoked without any arguments,
122.Nm 122.Nm
123will generate a RSA key for use in SSH protocol 2 connections. 123will generate an RSA key for use in SSH protocol 2 connections.
124.Pp 124.Pp
125.Nm 125.Nm
126is also used to generate groups for use in Diffie-Hellman group 126is also used to generate groups for use in Diffie-Hellman group