Author: mpostaire <maxime_postaire@hotmail.fr>
Description: Add the UseMPTCP config option to the manpages.
 https://github.com/openssh/openssh-portable/pull/335

diff -Naurp openssh.orig/scp.1 openssh/scp.1
--- openssh.orig/scp.1
+++ openssh/scp.1
@@ -220,6 +220,7 @@ For full details of the options listed b
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UpdateHostKeys
+.It UseMPTCP
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
diff -Naurp openssh.orig/sftp.1 openssh/sftp.1
--- openssh.orig/sftp.1
+++ openssh/sftp.1
@@ -282,6 +282,7 @@ For full details of the options listed b
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UpdateHostKeys
+.It UseMPTCP
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
diff -Naurp openssh.orig/ssh.1 openssh/ssh.1
--- openssh.orig/ssh.1
+++ openssh/ssh.1
@@ -593,6 +593,7 @@ For full details of the options listed b
 .It Tunnel
 .It TunnelDevice
 .It UpdateHostKeys
+.It UseMPTCP
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
diff -Naurp openssh.orig/ssh_config.5 openssh/ssh_config.5
--- openssh.orig/ssh_config.5
+++ openssh/ssh_config.5
@@ -2084,6 +2084,12 @@ Presently, only
 from OpenSSH 6.8 and greater support the
 .Qq hostkeys@openssh.com
 protocol extension used to inform the client of all the server's hostkeys.
+.It Cm UseMPTCP
+If set to
+.Cm yes ,
+this will enable Multipath TCP (MPTCP) instead of TCP (this only works on Linux).
+The default is
+.Cm no .
 .It Cm User
 Specifies the user to log in as.
 This can be useful when a different user name is used on different machines.
diff -Naurp openssh.orig/sshd_config.5 openssh/sshd_config.5
--- openssh.orig/sshd_config.5
+++ openssh/sshd_config.5
@@ -1906,6 +1906,12 @@ and
 .Cm Match
 .Cm Host
 directives.
+.It Cm UseMPTCP
+If set to
+.Cm yes ,
+this will enable Multipath TCP (MPTCP) instead of TCP (this only works on Linux).
+The default is
+.Cm no .
 .It Cm UsePAM
 Enables the Pluggable Authentication Module interface.
 If set to