Simplify and unify wording for the -I sourceaddr option in various places.

This is somewhat related to the "-b bind_addr" option some programs have,
which should get some cleanup also...
input florian claudio jmc

4 files changed, 26 insertions, 30 deletions

diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 48cf4362775..ac11a39bb9f 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftp.1,v 1.118 2020/01/16 16:46:47 schwarze Exp $
+.\"	$OpenBSD: ftp.1,v 1.119 2020/02/11 18:41:39 deraadt Exp $
 .\"	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd $Mdocdate: January 16 2020 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -43,13 +43,13 @@
 .Op Fl k Ar seconds
 .Op Fl P Ar port
 .Op Fl r Ar seconds
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Op Ar host Op Ar port
 .Nm ftp
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Sm off
 .Pf ftp:// Op Ar user : password No @
 .Ar host Op : Ar port
@@ -62,7 +62,7 @@
 .Op Fl N Ar name
 .Op Fl o Ar output
 .Op Fl S Ar ssl_options
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Op Fl U Ar useragent
 .Op Fl w Ar seconds
 .Sm off
@@ -76,13 +76,13 @@
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Pf file: Ar
 .Nm ftp
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Ar host : Ns / Ns Ar file Ns Op /
 .Ar ...
 .Sh DESCRIPTION
@@ -280,12 +280,9 @@ or
 setting is provided,
 .Pa /etc/ssl/cert.pem
 will be used.
-.It Fl s Ar srcaddr
-Use
-.Ar srcaddr
-on the local machine as the source address
-of the connection.
-Only useful on systems with more than one address.
+.It Fl s Ar sourceaddr
+Set the source address for connections, which is useful on machines
+with multiple interfaces.
 .It Fl t
 Enables packet tracing.
 .It Fl U Ar useragent
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 5f32501f161..d29caa7e09f 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.130 2019/10/23 16:48:59 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.131 2020/02/11 18:41:39 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -945,15 +945,15 @@ usage(void)
 #ifndef SMALL
 	    "ftp [-46AadEegiMmnptVv] [-D title] [-k seconds] [-P port] "
 	    "[-r seconds]\n"
-	    "           [-s srcaddr] [host [port]]\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr]\n"
+	    "           [-s sourceaddr] [host [port]]\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr]\n"
 	    "           ftp://[user:password@]host[:port]/file[/] ...\n"
 	    "       ftp [-C] [-c cookie] [-N name] [-o output] [-S ssl_options] "
-	    "[-s srcaddr]\n"
+	    "[-s sourceaddr]\n"
 	    "           [-U useragent] [-w seconds] "
 	    "http[s]://[user:password@]host[:port]/file ...\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] file:file ...\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] host:/file[/] ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr] file:file ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr] host:/file[/] ...\n"
 #else /* !SMALL */
 	    "ftp [-N name] [-o output] "
 	    "ftp://[user:password@]host[:port]/file[/] ...\n"
diff --git a/usr.bin/rsync/main.c b/usr.bin/rsync/main.c
index d348c5ffaec..17f0beef34f 100644
--- a/usr.bin/rsync/main.c
+++ b/usr.bin/rsync/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.48 2019/08/09 05:28:01 claudio Exp $ */
+/*	$Id: main.c,v 1.49 2020/02/11 18:41:39 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -509,7 +509,7 @@ main(int argc, char *argv[])
 	exit(rc);
 usage:
 	fprintf(stderr, "usage: %s"
-	    " [-aDglnoprtvx] [-e program] [--address=bind_address] [--del]\n"
+	    " [-aDglnoprtvx] [-e program] [--address=sourceaddr] [--del]\n"
 	    "\t[--numeric-ids] [--port=portnumber] [--rsync-path=program]\n"
 	    "\t[--version] source ... directory\n",
 	    getprogname());
diff --git a/usr.bin/rsync/rsync.1 b/usr.bin/rsync/rsync.1
index 243921f56a7..aa1f4696615 100644
--- a/usr.bin/rsync/rsync.1
+++ b/usr.bin/rsync/rsync.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rsync.1,v 1.20 2020/01/04 11:53:53 schwarze Exp $
+.\"	$OpenBSD: rsync.1,v 1.21 2020/02/11 18:41:39 deraadt Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 4 2020 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt OPENRSYNC 1
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm openrsync
 .Op Fl aDglnoprtvx
 .Op Fl e Ar program
-.Op Fl -address Ns = Ns Ar bind_address
+.Op Fl -address Ns = Ns Ar sourceaddr
 .Op Fl -del
 .Op Fl -numeric-ids
 .Op Fl -port Ns = Ns Ar service
@@ -51,12 +51,11 @@ The arguments are as follows:
 .It Fl a , -archive
 Shorthand for
 .Fl Dgloprt .
-.It Fl -address Ns = Ns Ar bind_address
-Use
-.Ar bind_address
-on the local machine as the source address of the connection.
-Only useful when connecting to an rsync daemon and on systems with more than
-one address.
+.It Fl -address Ns = Ns Ar sourceaddr
+When connecting to an rsync daemon, use
+.Ar sourceaddr
+as the source address for connections, which is useful on machines with
+multiple interfaces.
 .It Fl D
 Also transfer device and special files.
 Shorthand for