[openssh-commits] [openssh] 04/19: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 8b60ce8d8111e604c711c4cdd9579ffe0edced74
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Tue May 2 09:05:58 2017 +0000

    upstream commit
    
    more -O shuffle; ok djm
    
    Upstream-ID: c239991a3a025cdbb030b73e990188dd9bfbeceb
---
 ssh-keygen.1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0202fe75..ee90e7e3 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.137 2017/05/02 07:13:31 jmc Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.138 2017/05/02 09:05:58 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -425,7 +425,6 @@ This option may be specified multiple times.
 See also the
 .Sx CERTIFICATES
 section for further details.
-At present, no standard options are valid for host keys.
 The options that are valid for user certificates are:
 .Pp
 .Bl -tag -width Ds -compact
@@ -449,6 +448,8 @@ contents (usually indicating a flag).
 Extensions may be ignored by a client or server that does not recognise them,
 whereas unknown critical options will cause the certificate to be refused.
 .Pp
+At present, no standard options are valid for host keys.
+.Pp
 .It Ic force-command Ns = Ns Ar command
 Forces the execution of
 .Ar command

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.