upstream: some cleanup for BindInterface and ssh-keyscan;

OpenBSD-Commit-ID: 1a719ebeae22a166adf05bea5009add7075acc8c

5 files changed, 21 insertions, 18 deletions

diff --git a/scp.1 b/scp.1
index d6d9d97c1..8d251e34a 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.76 2017/10/25 06:19:46 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.77 2018/02/23 07:38:09 jmc Exp $
 .\"
-.Dd $Mdocdate: October 25 2017 $
+.Dd $Mdocdate: February 23 2018 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -124,6 +124,7 @@ For full details of the options listed below, and their possible values, see
 .It AddressFamily
 .It BatchMode
 .It BindAddress
+.It BindInterface
 .It CanonicalDomains
 .It CanonicalizeFallbackLocal
 .It CanonicalizeHostname
diff --git a/sftp.1 b/sftp.1
index 529be7fc6..43e0442f7 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.113 2017/11/03 03:46:52 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.114 2018/02/23 07:38:09 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: November 3 2017 $
+.Dd $Mdocdate: February 23 2018 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -194,6 +194,7 @@ For full details of the options listed below, and their possible values, see
 .It AddressFamily
 .It BatchMode
 .It BindAddress
+.It BindInterface
 .It CanonicalDomains
 .It CanonicalizeFallbackLocal
 .It CanonicalizeHostname
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index cdbce0b30..b6bee1771 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keyscan.1,v 1.41 2018/02/23 05:14:05 djm Exp $
+.\"	$OpenBSD: ssh-keyscan.1,v 1.42 2018/02/23 07:38:09 jmc Exp $
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
@@ -165,9 +165,10 @@ $ ssh-keyscan -t rsa,dsa,ecdsa,ed25519 -f ssh_hosts | \e
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr sshd 8
-.%R RFC 4255
-.%T "Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints"
+.Rs
 .%D 2006
+.%R RFC 4255
+.%T Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints
 .Re
 .Sh AUTHORS
 .An -nosplit
diff --git a/ssh.1 b/ssh.1
index d754b3a41..b4078525b 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.390 2018/02/23 02:34:33 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.391 2018/02/23 07:38:09 jmc Exp $
 .Dd $Mdocdate: February 23 2018 $
 .Dt SSH 1
 .Os
@@ -125,9 +125,9 @@ authenticate using the identities loaded into the agent.
 .It Fl a
 Disables forwarding of the authentication agent connection.
 .Pp
-.It Fl B Ar interface
+.It Fl B Ar bind_interface
 Bind to the address of
-.Ar interface
+.Ar bind_interface
 before attempting to connect to the destination host.
 This is only useful on systems with more than one address.
 .Pp
diff --git a/ssh_config.5 b/ssh_config.5
index bdf41371c..71705cabd 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.267 2018/02/23 02:34:33 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.268 2018/02/23 07:38:09 jmc Exp $
 .Dd $Mdocdate: February 23 2018 $
 .Dt SSH_CONFIG 5
 .Os
@@ -254,13 +254,6 @@ The argument must be
 or
 .Cm no
 (the default).
-.It Cm BindInterface
-Use the address of the specified interface on the local machine as the
-source address of the connection.
-Note that this option does not work if
-.Cm UsePrivilegedPort
-is set to
-.Cm yes .
 .It Cm BindAddress
 Use the specified address on the local machine as the source address of
 the connection.
@@ -269,6 +262,13 @@ Note that this option does not work if
 .Cm UsePrivilegedPort
 is set to
 .Cm yes .
+.It Cm BindInterface
+Use the address of the specified interface on the local machine as the
+source address of the connection.
+Note that this option does not work if
+.Cm UsePrivilegedPort
+is set to
+.Cm yes .
 .It Cm CanonicalDomains
 When
 .Cm CanonicalizeHostname