diff --git a/doc/man/kdig.1in b/doc/man/kdig.1in
index 3b0c4a536132880bdb621b20604ab27122415a78..7670f9f1b3f4affe3b2a59bbf14f09e98ae60cbf 100644
--- a/doc/man/kdig.1in
+++ b/doc/man/kdig.1in
@@ -128,6 +128,10 @@ Wrap long records to more lines and improve human readability.
 \fB+\fP[\fBno\fP]\fBshort\fP
 Show record data only.
 .TP
+\fB+\fP[\fBno\fP]\fBgeneric\fP
+Use the generic representation format when printing resource record types
+and data.
+.TP
 \fB+\fP[\fBno\fP]\fBaaflag\fP
 Set the AA flag.
 .TP
@@ -200,66 +204,32 @@ Don\(aqt use TCP automatically if a truncated reply is received.
 \fB+\fP[\fBno\fP]\fBnsid\fP
 Request the nameserver identifier (NSID).
 .TP
-\fB+\fP[\fBno\fP]\fBedns\fP=\fIN\fP
-Use EDNS version (default is 0).
-.TP
-\fB+noidn\fP
-Disable the IDN transformation to ASCII and vice versa. IDNA2003 support depends
-on libidn availability during project building!
-.TP
-\fB+generic\fP
-Use the generic representation format when printing resource record types
-and data.
+\fB+\fP[\fBno\fP]\fBbufsize\fP=\fIB\fP
+Set the EDNS buffer size in bytes (default is 512 bytes).
 .TP
-\fB+client\fP=\fISUBN\fP
+\fB+\fP[\fBno\fP]\fBclient\fP=\fISUBN\fP
 Set the EDNS client subnet SUBN=IP/prefix.
 .TP
-\fB+time\fP=\fIT\fP
+\fB+\fP[\fBno\fP]\fBedns\fP[=\fIN\fP]
+Use EDNS version (default is 0).
+.TP
+\fB+\fP[\fBno\fP]\fBtime\fP=\fIT\fP
 Set the wait\-for\-reply interval in seconds (default is 5 seconds). This timeout
 applies to each query attempt.
 .TP
-\fB+retry\fP=\fIN\fP
+\fB+\fP[\fBno\fP]\fBretry\fP=\fIN\fP
 Set the number (>=0) of UDP retries (default is 2). This doesn\(aqt apply to
 AXFR/IXFR.
 .TP
-\fB+bufsize\fP=\fIB\fP
-Set the EDNS buffer size in bytes (default is 512 bytes).
+\fB+noidn\fP
+Disable the IDN transformation to ASCII and vice versa. IDNA2003 support depends
+on libidn availability during project building!
 .UNINDENT
 .SH NOTES
 .sp
 Options \fB\-k\fP and \fB\-y\fP can not be used simultaneously.
 .sp
 Dnssec\-keygen keyfile format is not supported. Use \fIkeymgr(8)\fP instead.
-.sp
-Missing features with regard to ISC dig:
-.INDENT 0.0
-.INDENT 3.5
-Options \fB\-f\fP and \fB\-m\fP and query options:
-\fB+split\fP=\fIW\fP,
-\fB+tries\fP=\fIT\fP,
-\fB+ndots\fP=\fID\fP,
-\fB+domain\fP=\fIsomename\fP,
-\fB+trusted\-key\fP=\fI####\fP,
-\fB+\fP[\fBno\fP]\fBfail\fP,
-\fB+\fP[\fBno\fP]\fBvc\fP,
-\fB+\fP[\fBno\fP]\fBsearch\fP,
-\fB+\fP[\fBno\fP]\fBshowsearch\fP,
-\fB+\fP[\fBno\fP]\fBdefname\fP,
-\fB+\fP[\fBno\fP]\fBaaonly\fP,
-\fB+\fP[\fBno\fP]\fBcmd\fP,
-\fB+\fP[\fBno\fP]\fBidentify\fP,
-\fB+\fP[\fBno\fP]\fBcomments\fP,
-\fB+\fP[\fBno\fP]\fBrrcomments\fP,
-\fB+\fP[\fBno\fP]\fBonesoa\fP,
-\fB+\fP[\fBno\fP]\fBbesteffort\fP,
-\fB+\fP[\fBno\fP]\fBsigchase\fP,
-\fB+\fP[\fBno\fP]\fBtopdown\fP,
-\fB+\fP[\fBno\fP]\fBnssearch\fP, and
-\fB+\fP[\fBno\fP]\fBtrace\fP\&.
-.sp
-Per\-user file configuration via \fB~/.digrc\fP\&.
-.UNINDENT
-.UNINDENT
 .SH EXAMPLES
 .INDENT 0.0
 .IP 1. 3
diff --git a/doc/man/khost.1in b/doc/man/khost.1in
index c600f0d9bda6322e109d1d4abce192d1f23b80b2..5e6763638e587fe287cabf50be71ca5a6f105595 100644
--- a/doc/man/khost.1in
+++ b/doc/man/khost.1in
@@ -99,25 +99,6 @@ The number (>=0) of UDP retries to query a nameserver. The default is 1.
 The time to wait for a reply in seconds. This timeout applies to each query
 try. The default is 2 seconds.
 .UNINDENT
-.SH NOTES
-.sp
-Missing features with regard to ISC dig:
-.INDENT 0.0
-.INDENT 3.5
-Options \fB\-C\fP, \fB\-i\fP, \fB\-l\fP, \fB\-m\fP, \fB\-N\fP and \fB\-s\fP\&.
-.UNINDENT
-.UNINDENT
-.sp
-Differences with regard to ISC host:
-.INDENT 0.0
-.INDENT 3.5
-Option \fB\-d\fP is not equivalent to \fB\-v\fP, but enables debug messages.
-.sp
-The number of retries can be set to zero.
-.sp
-Verbose mode has slightly different format (same as \fBkdig\fP).
-.UNINDENT
-.UNINDENT
 .SH EXAMPLES
 .INDENT 0.0
 .IP 1. 3
diff --git a/doc/man/knsupdate.1in b/doc/man/knsupdate.1in
index 12e66000ecc1f7e9cff30778aba5b526efd663df..1aacad4b82d2483eaa8a0eb8c05307a802421700 100644
--- a/doc/man/knsupdate.1in
+++ b/doc/man/knsupdate.1in
@@ -158,27 +158,9 @@ Options \fB\-k\fP and \fB\-y\fP can not be used simultaneously.
 .sp
 Dnssec\-keygen keyfile format is not supported. Use \fIkeymgr(8)\fP instead.
 .sp
-Missing features with regard to ISC nsupdate:
-.INDENT 0.0
-.INDENT 3.5
-Authentication using GSS\-TSIG or SIG(0).
-.sp
-Options \fB\-D\fP, \fB\-g\fP, \fB\-o\fP, \fB\-l\fP, \fB\-L\fP, \fB\-R\fP and \fB\-u\fP\&.
-.sp
-Commands: \fBgsstsig\fP, \fBoldgsstsig\fP and \fBrealm\fP\&.
-.UNINDENT
-.UNINDENT
-.sp
-Differences with regard to ISC nsupdate:
-.INDENT 0.0
-.INDENT 3.5
-Zone name/server guessing, if the zone name/server is not specified.
+Zone name/server guessing is not supported if the zone name/server is not specified.
 .sp
 Empty line doesn\(aqt send the update.
-.sp
-BIND\-like key format (\fBddns\-confgen\fP output) is not supported.
-.UNINDENT
-.UNINDENT
 .SH EXAMPLES
 .INDENT 0.0
 .IP 1. 3
diff --git a/doc/man_kdig.rst b/doc/man_kdig.rst
index 72a2863e3399dce75a937441baf6348319ea2946..52e33fb292b0f56b3a49b35155f8f658f39085ee 100644
--- a/doc/man_kdig.rst
+++ b/doc/man_kdig.rst
@@ -105,6 +105,10 @@ Options
 **+**\ [\ **no**\ ]\ **short**
   Show record data only.
 
+**+**\ [\ **no**\ ]\ **generic**
+  Use the generic representation format when printing resource record types
+  and data.
+
 **+**\ [\ **no**\ ]\ **aaflag**
   Set the AA flag.
 
@@ -177,30 +181,26 @@ Options
 **+**\ [\ **no**\ ]\ **nsid**
   Request the nameserver identifier (NSID).
 
-**+**\ [\ **no**\ ]\ **edns**\ =\ *N*
-  Use EDNS version (default is 0).
-
-**+noidn**
-  Disable the IDN transformation to ASCII and vice versa. IDNA2003 support depends
-  on libidn availability during project building!
-
-**+generic**
-  Use the generic representation format when printing resource record types
-  and data.
+**+**\ [\ **no**\ ]\ **bufsize**\ =\ *B*
+  Set the EDNS buffer size in bytes (default is 512 bytes).
 
-**+client**\ =\ *SUBN*
+**+**\ [\ **no**\ ]\ **client**\ =\ *SUBN*
   Set the EDNS client subnet SUBN=IP/prefix.
 
-**+time**\ =\ *T*
+**+**\ [\ **no**\ ]\ **edns**\[\ =\ *N*\]
+  Use EDNS version (default is 0).
+
+**+**\ [\ **no**\ ]\ **time**\ =\ *T*
   Set the wait-for-reply interval in seconds (default is 5 seconds). This timeout
   applies to each query attempt.
 
-**+retry**\ =\ *N*
+**+**\ [\ **no**\ ]\ **retry**\ =\ *N*
   Set the number (>=0) of UDP retries (default is 2). This doesn't apply to
   AXFR/IXFR.
 
-**+bufsize**\ =\ *B*
-  Set the EDNS buffer size in bytes (default is 512 bytes).
+**+noidn**
+  Disable the IDN transformation to ASCII and vice versa. IDNA2003 support depends
+  on libidn availability during project building!
 
 Notes
 -----
@@ -209,33 +209,6 @@ Options **-k** and **-y** can not be used simultaneously.
 
 Dnssec-keygen keyfile format is not supported. Use :manpage:`keymgr(8)` instead.
 
-Missing features with regard to ISC dig:
-
-  Options **-f** and **-m** and query options:
-  **+split**\ =\ *W*,
-  **+tries**\ =\ *T*,
-  **+ndots**\ =\ *D*,
-  **+domain**\ =\ *somename*,
-  **+trusted-key**\ =\ *####*,
-  **+**\ [\ **no**\ ]\ **fail**,
-  **+**\ [\ **no**\ ]\ **vc**,
-  **+**\ [\ **no**\ ]\ **search**,
-  **+**\ [\ **no**\ ]\ **showsearch**,
-  **+**\ [\ **no**\ ]\ **defname**,
-  **+**\ [\ **no**\ ]\ **aaonly**,
-  **+**\ [\ **no**\ ]\ **cmd**,
-  **+**\ [\ **no**\ ]\ **identify**,
-  **+**\ [\ **no**\ ]\ **comments**,
-  **+**\ [\ **no**\ ]\ **rrcomments**,
-  **+**\ [\ **no**\ ]\ **onesoa**,
-  **+**\ [\ **no**\ ]\ **besteffort**,
-  **+**\ [\ **no**\ ]\ **sigchase**,
-  **+**\ [\ **no**\ ]\ **topdown**,
-  **+**\ [\ **no**\ ]\ **nssearch**, and
-  **+**\ [\ **no**\ ]\ **trace**.
-
-  Per-user file configuration via :file:`~/.digrc`.
-
 Examples
 --------
 
diff --git a/doc/man_khost.rst b/doc/man_khost.rst
index 43a27f0f9feff193a977ef7e44163b8db92f134a..b6e2d6ba86652b468aa693a3899ecba8adc9ea58 100644
--- a/doc/man_khost.rst
+++ b/doc/man_khost.rst
@@ -76,21 +76,6 @@ Options
   The time to wait for a reply in seconds. This timeout applies to each query
   try. The default is 2 seconds.
 
-Notes
------
-
-Missing features with regard to ISC dig:
-
-  Options **-C**, **-i**, **-l**, **-m**, **-N** and **-s**.
-
-Differences with regard to ISC host:
-
-  Option **-d** is not equivalent to **-v**, but enables debug messages.
-
-  The number of retries can be set to zero.
-
-  Verbose mode has slightly different format (same as :program:`kdig`).
-
 Examples
 --------
 
diff --git a/doc/man_knsupdate.rst b/doc/man_knsupdate.rst
index 09c6f04e34898c82e0aa9a73241f1323beba1780..157b5b430d846e32667c34f094811a5a30704ecc 100644
--- a/doc/man_knsupdate.rst
+++ b/doc/man_knsupdate.rst
@@ -136,21 +136,9 @@ Options **-k** and **-y** can not be used simultaneously.
 
 Dnssec-keygen keyfile format is not supported. Use :manpage:`keymgr(8)` instead.
 
-Missing features with regard to ISC nsupdate:
+Zone name/server guessing is not supported if the zone name/server is not specified.
 
-  Authentication using GSS-TSIG or SIG(0).
-
-  Options **-D**, **-g**, **-o**, **-l**, **-L**, **-R** and **-u**.
-
-  Commands: **gsstsig**, **oldgsstsig** and **realm**.
-
-Differences with regard to ISC nsupdate:
-
-  Zone name/server guessing, if the zone name/server is not specified.
-
-  Empty line doesn't send the update.
-
-  BIND-like key format (:program:`ddns-confgen` output) is not supported.
+Empty line doesn't send the update.
 
 Examples
 --------