manual page: drop +sit because it is merely a deprecated alias for +cookie

usage(): drop +defname because it is merely an alias for +search
both: correct option spelling +cl -> +class, +time -> +timeout
feedback and OK sthen@, OK jmc@

2 files changed, 18 insertions, 39 deletions

diff --git a/usr.sbin/bind/bin/dig/dig.1 b/usr.sbin/bind/bin/dig/dig.1
index 4fc2b02ba82..f94f1fef0c4 100644
--- a/usr.sbin/bind/bin/dig/dig.1
+++ b/usr.sbin/bind/bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dig.1,v 1.23 2019/12/31 19:18:16 jmc Exp $
+.\" $OpenBSD: dig.1,v 1.24 2020/01/02 10:27:46 schwarze Exp $
 .\"
 .\" Copyright (C) 2000-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
 .\"
@@ -14,7 +14,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 31 2019 $
+.Dd $Mdocdate: January 2 2020 $
 .Dt DIG 1
 .Os
 .Sh NAME
@@ -351,7 +351,7 @@ This requests the server to not perform DNSSEC validation of responses.
 .It Xo
 .Cm + Ns
 .Op Cm no Ns
-.Cm cl
+.Cm class
 .Xc
 Display the CLASS when printing the record.
 .It Xo
@@ -699,26 +699,6 @@ Perform a search showing intermediate results.
 .It Xo
 .Cm + Ns
 .Op Cm no Ns
-.Cm sit Ns
-.Op = Ns Ar #
-.Xc
-This option is a synonym for
-.Xo
-.Cm + Ns
-.Op Cm no Ns
-.Cm cookie
-.Xc .
-.Pp
-The
-.Xo
-.Cm + Ns
-.Op Cm no Ns
-.Cm sit
-.Xc
-option is deprecated.
-.It Xo
-.Cm + Ns
-.Op Cm no Ns
 .Cm split Ns = Ns Ar #
 .Xc
 Split long hex- or base64-formatted fields in resource records into chunks of
@@ -766,7 +746,7 @@ Use TCP when querying name servers.
 The default behavior is to use UDP unless an ixfr=N query is requested, in which
 case the default is TCP.
 AXFR queries always use TCP.
-.It Cm +time= Ns Ar #
+.It Cm +timeout Ns = Ns Ar #
 Sets the timeout for a query to
 .Ar #
 seconds.
diff --git a/usr.sbin/bind/bin/dig/dig.c b/usr.sbin/bind/bin/dig/dig.c
index 2781c167ece..4cb5a34a5e7 100644
--- a/usr.sbin/bind/bin/dig/dig.c
+++ b/usr.sbin/bind/bin/dig/dig.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.27 2019/12/31 19:18:16 jmc Exp $ */
+/* $Id: dig.c,v 1.28 2020/01/02 10:27:46 schwarze Exp $ */
 
 /*! \file */
 
@@ -150,20 +150,19 @@ rcode_totext(dns_rcode_t rcode)
 static void
 print_usage(FILE *fp) {
 	fputs(
-"usage:  dig [@server] [-46himuv] [-b address[#port]] [-c class] [-f file]\n"
-"            [-k keyfile] [-p port] [-q name] [-t type] [-x addr]\n"
-"            [-y [hmac:]name:key] [name] [type] [class]\n"
-"            +[no]aaonly +[no]additional +[no]adflag +[no]all +[no]answer\n"
-"            +[no]authority +[no]besteffort +bufsize=# +[no]cdflag +[no]cl\n"
-"            +[no]cmd +[no]comments +[no]cookie[=value] +[no]crypto +[no]defname\n"
-"            +[no]dnssec +domain=name +[no]edns[=#] +[no]ednsflags[=#]\n"
-"            +[no]ednsnegotiation +[no]ednsopt[=code[:value]]\n"
-"            +[no]expire +[no]fail +[no]identify +[no]idnout +[no]ignore\n"
-"            +[no]keepopen +[no]multiline +ndots=# +[no]nsid +[no]nssearch\n"
-"            +[no]onesoa +[no]opcode=# +[no]qr +[no]question +[no]recurse\n"
-"            +retry=# +[no]rrcomments +[no]search +[no]short +[no]showsearch\n"
-"            +[no]split=# +[no]stats +subnet=addr[/prefix] +[no]tcp +time=#\n"
-"            +[no]trace +tries=# +[no]ttlid +[no]vc\n", fp);
+"usage: dig [@server] [-46himuv] [-b address[#port]] [-c class] [-f file]\n"
+"           [-k keyfile] [-p port] [-q name] [-t type] [-x addr]\n"
+"           [-y [hmac:]name:key] [name] [type] [class]\n"
+"           +[no]aaonly +[no]additional +[no]adflag +[no]all +[no]answer\n"
+"           +[no]authority +[no]besteffort +bufsize=# +[no]cdflag +[no]class\n"
+"           +[no]cmd +[no]comments +[no]cookie[=value] +[no]crypto +[no]dnssec\n"
+"           +domain=name +[no]edns[=#] +[no]ednsflags[=#] +[no]ednsnegotiation\n"
+"           +[no]ednsopt[=code[:value]] +[no]expire +[no]fail +[no]identify\n"
+"           +[no]ignore +[no]keepopen +[no]multiline +ndots=# +[no]nsid\n"
+"           +[no]nssearch +[no]onesoa +[no]opcode=# +[no]qr +[no]question\n"
+"           +[no]recurse +retry=# +[no]rrcomments +[no]search +[no]short\n"
+"           +[no]showsearch +[no]split=# +[no]stats +subnet=addr[/prefix]\n"
+"           +[no]tcp +timeout=# +[no]trace +tries=# +[no]ttlid +[no]vc\n", fp);
 }
 
 ISC_PLATFORM_NORETURN_PRE static void