upstream commit

sort the -o list;

Upstream-ID: 1a97465ede8790b4d47cb618269978e07f41f8ac

diff --git a/scp.1 b/scp.1
index 0141f0d974880edd931f510757689234563c90de..3f5459089c3f0965e20b658ce7c574cd6ce5979a 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.69 2016/05/04 14:32:26 markus Exp $
+.\" $OpenBSD: scp.1,v 1.70 2016/06/29 17:14:28 jmc Exp $
 .\"
-.Dd $Mdocdate: May 4 2016 $
+.Dd $Mdocdate: June 29 2016 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -155,9 +155,9 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It HostName
+.It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
-.It IdentitiesOnly
 .It IPQoS
 .It KbdInteractiveAuthentication
 .It KbdInteractiveDevices

diff --git a/sftp.1 b/sftp.1
index 7caf476a9071377b3808fd04189fba9f804bcf80..ab8b186af85c23ae1692816278792bc6410ce3ec 100644 (file)
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.103 2016/05/04 14:32:26 markus Exp $
+.\" $OpenBSD: sftp.1,v 1.104 2016/06/29 17:14:28 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,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: May 4 2016 $
+.Dd $Mdocdate: June 29 2016 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -220,9 +220,9 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It HostName
+.It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
-.It IdentitiesOnly
 .It IPQoS
 .It KbdInteractiveAuthentication
 .It KbdInteractiveDevices

diff --git a/ssh.1 b/ssh.1
index a6fb5d48e59d592f60d9d8e1da6acf578d8c2520..32949b0569bd192c286ddbe449b5df0537224621 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (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.373 2016/06/03 06:44:12 jmc Exp $
-.Dd $Mdocdate: June 3 2016 $
+.\" $OpenBSD: ssh.1,v 1.374 2016/06/29 17:14:28 jmc Exp $
+.Dd $Mdocdate: June 29 2016 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -501,9 +501,9 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It HostName
+.It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
-.It IdentitiesOnly
 .It Include
 .It IPQoS
 .It KbdInteractiveAuthentication