summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 10:41:26 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 10:41:26 +1100
commit8f6c337563f2217b6704f0f40bed68cee349f8c4 (patch)
treead79de5f4ecb4b27f8ae2da2b090154713de62ed
parent179eee081a560f3e10506ae3a2facdc1c766f0f6 (diff)
- jmc@cvs.openbsd.org 2010/03/04 22:52:40
[ssh-keygen.1] fix Bk/Ek;
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.15
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 254575307..1659e324a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - djm@cvs.openbsd.org 2010/03/04 20:35:08 6 - djm@cvs.openbsd.org 2010/03/04 20:35:08
7 [ssh-keygen.1 ssh-keygen.c] 7 [ssh-keygen.1 ssh-keygen.c]
8 Add a -L flag to print the contents of a certificate; ok markus@ 8 Add a -L flag to print the contents of a certificate; ok markus@
9 - jmc@cvs.openbsd.org 2010/03/04 22:52:40
10 [ssh-keygen.1]
11 fix Bk/Ek;
9 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older 12 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
10 compilers. OK djm@ 13 compilers. OK djm@
11 14
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index dccf5eabc..069d87649 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.86 2010/03/04 20:35:08 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.87 2010/03/04 22:52:40 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -52,7 +52,6 @@
52.Op Fl N Ar new_passphrase 52.Op Fl N Ar new_passphrase
53.Op Fl C Ar comment 53.Op Fl C Ar comment
54.Op Fl f Ar output_keyfile 54.Op Fl f Ar output_keyfile
55.Ek
56.Nm ssh-keygen 55.Nm ssh-keygen
57.Fl p 56.Fl p
58.Op Fl P Ar old_passphrase 57.Op Fl P Ar old_passphrase
@@ -107,7 +106,6 @@
107.Op Fl a Ar num_trials 106.Op Fl a Ar num_trials
108.Op Fl W Ar generator 107.Op Fl W Ar generator
109.Nm ssh-keygen 108.Nm ssh-keygen
110.Bk -words
111.Fl s Ar ca_key 109.Fl s Ar ca_key
112.Fl I Ar certificate_identity 110.Fl I Ar certificate_identity
113.Op Fl h 111.Op Fl h
@@ -116,7 +114,6 @@
116.Op Fl V Ar validity_interval 114.Op Fl V Ar validity_interval
117.Ar 115.Ar
118.Nm ssh-keygen 116.Nm ssh-keygen
119.Bk -words
120.Fl L 117.Fl L
121.Op Fl f Ar input_keyfile 118.Op Fl f Ar input_keyfile
122.Ek 119.Ek