From: jmc@openbsd.org <jmc@openbsd.org>
Date: Fri, 27 Dec 2019 08:25:07 +0000 (+0000)
Subject: upstream: in the options list, sort -Y and -y;
X-Git-Tag: V_8_2_P1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b6c954751dd3677466cda7adb92e4f05446c96c;p=thirdparty%2Fopenssh-portable.git

upstream: in the options list, sort -Y and -y;

OpenBSD-Commit-ID: 24c2e6a3aeab6e050a0271ffc73fdff91c10dcaa
---

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index e48597388..8d62bc72e 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.180 2019/12/21 20:22:34 naddy Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.181 2019/12/27 08:25:07 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: December 21 2019 $
+.Dd $Mdocdate: December 27 2019 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -688,9 +688,6 @@ Note that
 .Xr sshd 8
 will refuse such signatures by default, unless overridden via
 an authorized_keys option.
-.It Fl y
-This option will read a private
-OpenSSH format file and print an OpenSSH public key to stdout.
 .It Fl Y Cm sign
 Cryptographically sign a file or some data using a SSH key.
 When signing,
@@ -763,6 +760,9 @@ flag.
 Successful testing of the signature is signalled by
 .Nm
 returning a zero exit status.
+.It Fl y
+This option will read a private
+OpenSSH format file and print an OpenSSH public key to stdout.
 .It Fl z Ar serial_number
 Specifies a serial number to be embedded in the certificate to distinguish
 this certificate from others from the same CA.