summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.14
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4df02fbb1..d95e80aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 [ssh-keygen.1] 27 [ssh-keygen.1]
28 Certificates are named *-cert.pub, not *_cert.pub; committing a diff 28 Certificates are named *-cert.pub, not *_cert.pub; committing a diff
29 from stevesk@ ok me 29 from stevesk@ ok me
30 - jmc@cvs.openbsd.org 2010/03/13 23:38:13
31 [ssh-keygen.1]
32 fix a formatting error (args need quoted); noted by stevesk
30 33
3120100314 3420100314
32 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix 35 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 1ee0835f3..3e03a9bd0 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.91 2010/03/13 21:45:46 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.92 2010/03/13 23:38:13 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -538,7 +538,7 @@ By default, generated certificates are valid for all users or hosts.
538To generate a certificate for a specified set of principals: 538To generate a certificate for a specified set of principals:
539.Pp 539.Pp
540.Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub 540.Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub
541.Dl $ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub 541.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub"
542.Pp 542.Pp
543Additional limitations on the validity and use of user certificates may 543Additional limitations on the validity and use of user certificates may
544be specified through certificate constraints. 544be specified through certificate constraints.