[openssh-commits] [openssh] 01/05: upstream commit

[git+noreply at mindrot.org]

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

dtucker pushed a commit to branch master
in repository openssh.

commit 130283d5c2545ff017c2162dc1258c5354e29399
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jan 25 03:34:43 2018 +0000

    upstream commit
    
    certificate options are case-sensitive; fix case on one
    that had it wrong.
    
    move a badly-place sentence to a less bad place
    
    OpenBSD-Commit-ID: 231e516bba860699a1eece6d48532d825f5f747b
---
 ssh-keygen.1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0ade33de..f925eb2d 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.145 2017/11/03 05:14:04 djm Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.146 2018/01/25 03:34:43 djm Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at 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: November 3 2017 $
+.Dd $Mdocdate: January 25 2018 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -425,6 +425,8 @@ This option may be specified multiple times.
 See also the
 .Sx CERTIFICATES
 section for further details.
+.Pp
+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
@@ -448,8 +450,6 @@ 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
@@ -494,7 +494,7 @@ Allows execution of
 by
 .Xr sshd 8 .
 .Pp
-.It Ic permit-x11-forwarding
+.It Ic permit-X11-forwarding
 Allows X11 forwarding.
 .Pp
 .It Ic source-address Ns = Ns Ar address_list

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