summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh-keygen.1
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2019-09-29 16:31:58 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2019-09-29 16:31:58 +0000
commitbd6000c1dfa00951ce54b3c9c59b9c0be2a93db6 (patch)
tree2e60e1e17d56f2e597055ed8c5578cf6efd39860 /usr.bin/ssh/ssh-keygen.1
parentd2120a931de15ccdc23f80f07346bf36ed5afcb8 (diff)
group and sort single letter options; ok deraadt
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.1')
-rw-r--r--usr.bin/ssh/ssh-keygen.112
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 5d499fc5ec9..637dd4231ef 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.169 2019/09/27 20:03:24 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 jmc Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 27 2019 $
+.Dd $Mdocdate: September 29 2019 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -85,9 +85,8 @@
.Fl D Ar pkcs11
.Nm ssh-keygen
.Fl F Ar hostname
+.Op Fl lv
.Op Fl f Ar known_hosts_file
-.Op Fl l
-.Op Fl v
.Nm ssh-keygen
.Fl H
.Op Fl f Ar known_hosts_file
@@ -96,8 +95,8 @@
.Op Fl f Ar known_hosts_file
.Nm ssh-keygen
.Fl r Ar hostname
-.Op Fl f Ar input_keyfile
.Op Fl g
+.Op Fl f Ar input_keyfile
.Nm ssh-keygen
.Fl G Ar output_file
.Op Fl v
@@ -116,8 +115,7 @@
.Nm ssh-keygen
.Fl s Ar ca_key
.Fl I Ar certificate_identity
-.Op Fl h
-.Op Fl U
+.Op Fl hU
.Op Fl D Ar pkcs11_provider
.Op Fl n Ar principals
.Op Fl O Ar option