From 507b448a2465a53ab03a88acbc71cc51b48ca6ac Mon Sep 17 00:00:00 2001
From: "naddy@openbsd.org" <naddy@openbsd.org>
Date: Tue, 26 Jan 2021 15:40:17 +0000
Subject: [PATCH] upstream: move HostbasedAcceptedAlgorithms to the right place
 in

alphabetical order

OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec
---
 scp.1        |  4 ++--
 sftp.1       |  4 ++--
 ssh.1        |  4 ++--
 ssh_config.5 | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scp.1 b/scp.1
index 45cffdac4..5471ea31b 100644
--- a/scp.1
+++ b/scp.1
@@ -8,7 +8,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.94 2021/01/26 05:32:21 dtucker Exp $
+.\" $OpenBSD: scp.1,v 1.95 2021/01/26 15:40:17 naddy Exp $
 .\"
 .Dd $Mdocdate: January 26 2021 $
 .Dt SCP 1
@@ -172,8 +172,8 @@ For full details of the options listed below, and their possible values, see
 .It GSSAPIDelegateCredentials
 .It HashKnownHosts
 .It Host
-.It HostbasedAuthentication
 .It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It Hostname
diff --git a/sftp.1 b/sftp.1
index 6e713e643..052d4d8e4 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.135 2021/01/26 05:32:21 dtucker Exp $
+.\" $OpenBSD: sftp.1,v 1.136 2021/01/26 15:40:17 naddy Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -246,8 +246,8 @@ For full details of the options listed below, and their possible values, see
 .It GSSAPIDelegateCredentials
 .It HashKnownHosts
 .It Host
-.It HostbasedAuthentication
 .It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It Hostname
diff --git a/ssh.1 b/ssh.1
index a9f67b4b9..5884b471f 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,7 +33,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.
 .\"
-.\" $OpenBSD: ssh.1,v 1.417 2021/01/26 05:32:21 dtucker Exp $
+.\" $OpenBSD: ssh.1,v 1.418 2021/01/26 15:40:17 naddy Exp $
 .Dd $Mdocdate: January 26 2021 $
 .Dt SSH 1
 .Os
@@ -509,8 +509,8 @@ For full details of the options listed below, and their possible values, see
 .It GSSAPIDelegateCredentials
 .It HashKnownHosts
 .It Host
-.It HostbasedAuthentication
 .It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It Hostname
diff --git a/ssh_config.5 b/ssh_config.5
index d099903f7..1a36427d0 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,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.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.344 2021/01/26 05:32:22 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.345 2021/01/26 15:40:17 naddy Exp $
 .Dd $Mdocdate: January 26 2021 $
 .Dt SSH_CONFIG 5
 .Os
@@ -800,14 +800,6 @@ Note that existing names and addresses in known hosts files
 will not be converted automatically,
 but may be manually hashed using
 .Xr ssh-keygen 1 .
-.It Cm HostbasedAuthentication
-Specifies whether to try rhosts based authentication with public key
-authentication.
-The argument must be
-.Cm yes
-or
-.Cm no
-(the default).
 .It Cm HostbasedAcceptedAlgorithms
 Specifies the key types that will be used for hostbased authentication
 as a comma-separated list of patterns.
@@ -847,6 +839,14 @@ option of
 .Xr ssh 1
 may be used to list supported key types.
 This was formerly named HostbasedKeyTypes.
+.It Cm HostbasedAuthentication
+Specifies whether to try rhosts based authentication with public key
+authentication.
+The argument must be
+.Cm yes
+or
+.Cm no
+(the default).
 .It Cm HostKeyAlgorithms
 Specifies the host key algorithms
 that the client wants to use in order of preference.