summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.14
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 53506beb8..274e93b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 - jakob@cvs.openbsd.org 2004/08/12 21:41:13 15 - jakob@cvs.openbsd.org 2004/08/12 21:41:13
16 [ssh-keygen.1 ssh.1] 16 [ssh-keygen.1 ssh.1]
17 improve SSHFP documentation; ok deraadt@ 17 improve SSHFP documentation; ok deraadt@
18 - jmc@cvs.openbsd.org 2004/08/13 00:01:43
19 [ssh-keygen.1]
20 kill whitespace at eol;
18 21
1920040812 2220040812
20 - (dtucker) [sshd.c] Remove duplicate variable imported during sync. 23 - (dtucker) [sshd.c] Remove duplicate variable imported during sync.
@@ -1612,4 +1615,4 @@
1612 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1615 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1613 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1616 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1614 1617
1615$Id: ChangeLog,v 1.3502 2004/08/13 11:22:40 dtucker Exp $ 1618$Id: ChangeLog,v 1.3503 2004/08/13 11:23:25 dtucker Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 824b6e09c..c0f24dcd0 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.62 2004/08/12 21:41:13 jakob Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.63 2004/08/13 00:01:43 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -193,7 +193,7 @@ This option allows exporting keys for use by several commercial
193SSH implementations. 193SSH implementations.
194.It Fl g 194.It Fl g
195Use generic DNS format when printing fingerprint resource records using the 195Use generic DNS format when printing fingerprint resource records using the
196.Fl r 196.Fl r
197command. 197command.
198.It Fl f Ar filename 198.It Fl f Ar filename
199Specifies the filename of the key file. 199Specifies the filename of the key file.