diff --git a/bin/delv/delv.1 b/bin/delv/delv.1
index 7687975f24..a52f4cb05a 100644
--- a/bin/delv/delv.1
+++ b/bin/delv/delv.1
@@ -39,7 +39,7 @@
 delv \- DNS lookup and validation utility
 .SH "SYNOPSIS"
 .HP \w'\fBdelv\fR\ 'u
-\fBdelv\fR [@server] [\fB\-4\fR] [\fB\-6\fR] [\fB\-a\ \fR\fB\fIanchor\-file\fR\fR] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-d\ \fR\fB\fIlevel\fR\fR] [\fB\-i\fR] [\fB\-m\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [name] [type] [class] [queryopt...]
+\fBdelv\fR [@server] [[\fB\-4\fR] | [\fB\-6\fR]] [\fB\-a\ \fR\fB\fIanchor\-file\fR\fR] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-d\ \fR\fB\fIlevel\fR\fR] [\fB\-i\fR] [\fB\-m\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [name] [type] [class] [queryopt...]
 .HP \w'\fBdelv\fR\ 'u
 \fBdelv\fR [\fB\-h\fR]
 .HP \w'\fBdelv\fR\ 'u
diff --git a/bin/delv/delv.html b/bin/delv/delv.html
index b297e53e41..67c9960cbd 100644
--- a/bin/delv/delv.html
+++ b/bin/delv/delv.html
@@ -34,8 +34,10 @@
     <div class="cmdsynopsis"><p>
       <code class="command">delv</code> 
        [@server]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-a <em class="replaceable"><code>anchor-file</code></em></code>]
        [<code class="option">-b <em class="replaceable"><code>address</code></em></code>]
        [<code class="option">-c <em class="replaceable"><code>class</code></em></code>]
diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 5e6ec99a87..47ad3652c0 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -39,7 +39,7 @@
 dig \- DNS lookup utility
 .SH "SYNOPSIS"
 .HP \w'\fBdig\fR\ 'u
-\fBdig\fR [@server] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-k\ \fR\fB\fIfilename\fR\fR] [\fB\-m\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-v\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIname:key\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [name] [type] [class] [queryopt...]
+\fBdig\fR [@server] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-k\ \fR\fB\fIfilename\fR\fR] [\fB\-m\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-q\ \fR\fB\fIname\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-v\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIname:key\fR\fR] [[\fB\-4\fR] | [\fB\-6\fR]] [name] [type] [class] [queryopt...]
 .HP \w'\fBdig\fR\ 'u
 \fBdig\fR [\fB\-h\fR]
 .HP \w'\fBdig\fR\ 'u
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index f50489c285..6c26f005f6 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -45,8 +45,10 @@
        [<code class="option">-v</code>]
        [<code class="option">-x <em class="replaceable"><code>addr</code></em></code>]
        [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]name:key</code></em></code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [name]
        [type]
        [class]
diff --git a/bin/dig/host.1 b/bin/dig/host.1
index 22dc509381..307b7880b3 100644
--- a/bin/dig/host.1
+++ b/bin/dig/host.1
@@ -39,7 +39,7 @@
 host \- DNS lookup utility
 .SH "SYNOPSIS"
 .HP \w'\fBhost\fR\ 'u
-\fBhost\fR [\fB\-aACdlnrsTUwv\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-N\ \fR\fB\fIndots\fR\fR] [\fB\-R\ \fR\fB\fInumber\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-W\ \fR\fB\fIwait\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [\fB\-v\fR] [\fB\-V\fR] {name} [server]
+\fBhost\fR [\fB\-aACdlnrsTUwv\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-N\ \fR\fB\fIndots\fR\fR] [\fB\-R\ \fR\fB\fInumber\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-W\ \fR\fB\fIwait\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [[\fB\-4\fR] | [\fB\-6\fR]] [\fB\-v\fR] [\fB\-V\fR] {name} [server]
 .SH "DESCRIPTION"
 .PP
 \fBhost\fR
diff --git a/bin/dig/host.html b/bin/dig/host.html
index ca420ec589..c355d95b39 100644
--- a/bin/dig/host.html
+++ b/bin/dig/host.html
@@ -40,8 +40,10 @@
        [<code class="option">-t <em class="replaceable"><code>type</code></em></code>]
        [<code class="option">-W <em class="replaceable"><code>wait</code></em></code>]
        [<code class="option">-m <em class="replaceable"><code>flag</code></em></code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-v</code>]
        [<code class="option">-V</code>]
        {name}
diff --git a/bin/named/lwresd.8 b/bin/named/lwresd.8
index 408a3ef1ad..a55e9d6baf 100644
--- a/bin/named/lwresd.8
+++ b/bin/named/lwresd.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC")
 .\" 
 .\" This Source Code Form is subject to the terms of the Mozilla Public
 .\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39,7 +39,7 @@
 lwresd \- lightweight resolver daemon
 .SH "SYNOPSIS"
 .HP \w'\fBlwresd\fR\ 'u
-\fBlwresd\fR [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-C\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-d\ \fR\fB\fIdebug\-level\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-i\ \fR\fB\fIpid\-file\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-n\ \fR\fB\fI#cpus\fR\fR] [\fB\-P\ \fR\fB\fIport\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-s\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-4\fR] [\fB\-6\fR]
+\fBlwresd\fR [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-C\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-d\ \fR\fB\fIdebug\-level\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-i\ \fR\fB\fIpid\-file\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-n\ \fR\fB\fI#cpus\fR\fR] [\fB\-P\ \fR\fB\fIport\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-s\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [[\fB\-4\fR] | [\fB\-6\fR]]
 .SH "DESCRIPTION"
 .PP
 \fBlwresd\fR
@@ -246,5 +246,5 @@ The default process\-id file\&.
 \fBInternet Systems Consortium, Inc\&.\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2000, 2001, 2004, 2005, 2007-2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000, 2001, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC")
 .br
diff --git a/bin/named/lwresd.html b/bin/named/lwresd.html
index 85f61eeed1..0924bf2664 100644
--- a/bin/named/lwresd.html
+++ b/bin/named/lwresd.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
- - Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000, 2001, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC")
  - 
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -47,8 +47,10 @@
        [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>]
        [<code class="option">-u <em class="replaceable"><code>user</code></em></code>]
        [<code class="option">-v</code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
     </p></div>
   </div>
 
diff --git a/bin/named/named.8 b/bin/named/named.8
index 99ca1e327e..81181df590 100644
--- a/bin/named/named.8
+++ b/bin/named/named.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000, 2001, 2003-2009, 2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000, 2001, 2003-2009, 2011, 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 .\" 
 .\" This Source Code Form is subject to the terms of the Mozilla Public
 .\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39,7 +39,7 @@
 named \- Internet domain name server
 .SH "SYNOPSIS"
 .HP \w'\fBnamed\fR\ 'u
-\fBnamed\fR [\fB\-4\fR] [\fB\-6\fR] [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-d\ \fR\fB\fIdebug\-level\fR\fR] [\fB\-D\ \fR\fB\fIstring\fR\fR] [\fB\-E\ \fR\fB\fIengine\-name\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-L\ \fR\fB\fIlogfile\fR\fR] [\fB\-M\ \fR\fB\fIoption\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-n\ \fR\fB\fI#cpus\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-s\fR] [\fB\-S\ \fR\fB\fI#max\-socks\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-U\ \fR\fB\fI#listeners\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-V\fR] [\fB\-X\ \fR\fB\fIlock\-file\fR\fR] [\fB\-x\ \fR\fB\fIcache\-file\fR\fR]
+\fBnamed\fR [[\fB\-4\fR] | [\fB\-6\fR]] [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-d\ \fR\fB\fIdebug\-level\fR\fR] [\fB\-D\ \fR\fB\fIstring\fR\fR] [\fB\-E\ \fR\fB\fIengine\-name\fR\fR] [\fB\-f\fR] [\fB\-g\fR] [\fB\-L\ \fR\fB\fIlogfile\fR\fR] [\fB\-M\ \fR\fB\fIoption\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-n\ \fR\fB\fI#cpus\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-s\fR] [\fB\-S\ \fR\fB\fI#max\-socks\fR\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] [\fB\-U\ \fR\fB\fI#listeners\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-V\fR] [\fB\-X\ \fR\fB\fIlock\-file\fR\fR] [\fB\-x\ \fR\fB\fIcache\-file\fR\fR]
 .SH "DESCRIPTION"
 .PP
 \fBnamed\fR
@@ -375,5 +375,5 @@ BIND 9 Administrator Reference Manual\&.
 \fBInternet Systems Consortium, Inc\&.\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2000, 2001, 2003-2009, 2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000, 2001, 2003-2009, 2011, 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 .br
diff --git a/bin/named/named.html b/bin/named/named.html
index bc7a88ac70..f2ada08585 100644
--- a/bin/named/named.html
+++ b/bin/named/named.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
- - Copyright (C) 2000, 2001, 2003-2009, 2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000, 2001, 2003-2009, 2011, 2013-2017 Internet Systems Consortium, Inc. ("ISC")
  - 
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,8 +33,10 @@
 <h2>Synopsis</h2>
     <div class="cmdsynopsis"><p>
       <code class="command">named</code> 
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>]
        [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>]
        [<code class="option">-D <em class="replaceable"><code>string</code></em></code>]
diff --git a/bin/nsupdate/nsupdate.1 b/bin/nsupdate/nsupdate.1
index c1413fde01..0278cd8163 100644
--- a/bin/nsupdate/nsupdate.1
+++ b/bin/nsupdate/nsupdate.1
@@ -39,7 +39,7 @@
 nsupdate \- Dynamic DNS update utility
 .SH "SYNOPSIS"
 .HP \w'\fBnsupdate\fR\ 'u
-\fBnsupdate\fR [\fB\-d\fR] [\fB\-D\fR] [\fB\-i\fR] [\fB\-L\ \fR\fB\fIlevel\fR\fR] [[\fB\-g\fR] | [\fB\-o\fR] | [\fB\-l\fR] | [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIkeyname:secret\fR\fR] | [\fB\-k\ \fR\fB\fIkeyfile\fR\fR]] [\fB\-t\ \fR\fB\fItimeout\fR\fR] [\fB\-u\ \fR\fB\fIudptimeout\fR\fR] [\fB\-r\ \fR\fB\fIudpretries\fR\fR] [\fB\-R\ \fR\fB\fIrandomdev\fR\fR] [\fB\-v\fR] [\fB\-T\fR] [\fB\-P\fR] [\fB\-V\fR] [filename]
+\fBnsupdate\fR [\fB\-d\fR] [\fB\-D\fR] [\fB\-i\fR] [\fB\-L\ \fR\fB\fIlevel\fR\fR] [[\fB\-g\fR] | [\fB\-o\fR] | [\fB\-l\fR] | [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIkeyname:secret\fR\fR] | [\fB\-k\ \fR\fB\fIkeyfile\fR\fR]] [\fB\-t\ \fR\fB\fItimeout\fR\fR] [\fB\-u\ \fR\fB\fIudptimeout\fR\fR] [\fB\-r\ \fR\fB\fIudpretries\fR\fR] [\fB\-R\ \fR\fB\fIrandomdev\fR\fR] [\fB\-v\fR] [\fB\-T\fR] [\fB\-P\fR] [\fB\-V\fR] [[\fB\-4\fR] | [\fB\-6\fR]] [filename]
 .SH "DESCRIPTION"
 .PP
 \fBnsupdate\fR
@@ -82,6 +82,16 @@ flag\&. A non\-standards\-compliant variant of GSS\-TSIG used by Windows 2000 ca
 flag\&.
 .SH "OPTIONS"
 .PP
+\-4
+.RS 4
+Use IPv4 only\&.
+.RE
+.PP
+\-6
+.RS 4
+Use IPv6 only\&.
+.RE
+.PP
 \-d
 .RS 4
 Debug mode\&. This provides tracing information about the update requests that are made and the replies received from the name server\&.
diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index 75421f1379..350a7c9565 100644
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -51,6 +51,10 @@
        [<code class="option">-T</code>]
        [<code class="option">-P</code>]
        [<code class="option">-V</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [filename]
     </p></div>
   </div>
@@ -120,6 +124,18 @@
 
 
     <div class="variablelist"><dl class="variablelist">
+<dt><span class="term">-4</span></dt>
+<dd>
+	  <p>
+	    Use IPv4 only.
+	  </p>
+	</dd>
+<dt><span class="term">-6</span></dt>
+<dd>
+	  <p>
+	    Use IPv6 only.
+	  </p>
+	</dd>
 <dt><span class="term">-d</span></dt>
 <dd>
 	  <p>
diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8
index 71729fb829..b8dcdd709c 100644
--- a/bin/rndc/rndc.8
+++ b/bin/rndc/rndc.8
@@ -39,7 +39,7 @@
 rndc \- name server control utility
 .SH "SYNOPSIS"
 .HP \w'\fBrndc\fR\ 'u
-\fBrndc\fR [\fB\-b\ \fR\fB\fIsource\-address\fR\fR] [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-k\ \fR\fB\fIkey\-file\fR\fR] [\fB\-s\ \fR\fB\fIserver\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-q\fR] [\fB\-r\fR] [\fB\-V\fR] [\fB\-y\ \fR\fB\fIkey_id\fR\fR] {command}
+\fBrndc\fR [\fB\-b\ \fR\fB\fIsource\-address\fR\fR] [\fB\-c\ \fR\fB\fIconfig\-file\fR\fR] [\fB\-k\ \fR\fB\fIkey\-file\fR\fR] [\fB\-s\ \fR\fB\fIserver\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-q\fR] [\fB\-r\fR] [\fB\-V\fR] [\fB\-y\ \fR\fB\fIkey_id\fR\fR] [[\fB\-4\fR] | [\fB\-6\fR]] {command}
 .SH "DESCRIPTION"
 .PP
 \fBrndc\fR
@@ -59,6 +59,16 @@ and
 reads a configuration file to determine how to contact the name server and decide what algorithm and key it should use\&.
 .SH "OPTIONS"
 .PP
+\-4
+.RS 4
+Use IPv4 only\&.
+.RE
+.PP
+\-6
+.RS 4
+Use IPv6 only\&.
+.RE
+.PP
 \-b \fIsource\-address\fR
 .RS 4
 Use
diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html
index 636a34f53e..638054299d 100644
--- a/bin/rndc/rndc.html
+++ b/bin/rndc/rndc.html
@@ -42,6 +42,10 @@
        [<code class="option">-r</code>]
        [<code class="option">-V</code>]
        [<code class="option">-y <em class="replaceable"><code>key_id</code></em></code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        {command}
     </p></div>
   </div>
@@ -84,6 +88,18 @@
 
 
     <div class="variablelist"><dl class="variablelist">
+<dt><span class="term">-4</span></dt>
+<dd>
+	  <p>
+	    Use IPv4 only.
+	  </p>
+	</dd>
+<dt><span class="term">-6</span></dt>
+<dd>
+	  <p>
+	    Use IPv6 only.
+	  </p>
+	</dd>
 <dt><span class="term">-b <em class="replaceable"><code>source-address</code></em></span></dt>
 <dd>
 	  <p>
diff --git a/bin/tools/mdig.1 b/bin/tools/mdig.1
index 2cac973e6f..93b5aa5fc4 100644
--- a/bin/tools/mdig.1
+++ b/bin/tools/mdig.1
@@ -39,7 +39,7 @@
 mdig \- DNS pipelined lookup utility
 .SH "SYNOPSIS"
 .HP \w'\fBmdig\fR\ 'u
-\fBmdig\fR {@server} [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-h\fR] [\fB\-v\fR] [\fB\-4\fR] [\fB\-6\fR] [\fB\-m\fR] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-i\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [plusopt...]
+\fBmdig\fR {@server} [\fB\-f\ \fR\fB\fIfilename\fR\fR] [\fB\-h\fR] [\fB\-v\fR] [[\fB\-4\fR] | [\fB\-6\fR]] [\fB\-m\fR] [\fB\-b\ \fR\fB\fIaddress\fR\fR] [\fB\-p\ \fR\fB\fIport#\fR\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-i\fR] [\fB\-x\ \fR\fB\fIaddr\fR\fR] [plusopt...]
 .HP \w'\fBmdig\fR\ 'u
 \fBmdig\fR {\-h}
 .HP \w'\fBmdig\fR\ 'u
diff --git a/bin/tools/mdig.html b/bin/tools/mdig.html
index 5f5134db9e..dc0e8eb70a 100644
--- a/bin/tools/mdig.html
+++ b/bin/tools/mdig.html
@@ -35,8 +35,10 @@
        [<code class="option">-f <em class="replaceable"><code>filename</code></em></code>]
        [<code class="option">-h</code>]
        [<code class="option">-v</code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-m</code>]
        [<code class="option">-b <em class="replaceable"><code>address</code></em></code>]
        [<code class="option">-p <em class="replaceable"><code>port#</code></em></code>]
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 7395e2f438..511404d9bd 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -231,6 +231,13 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_features"></a>New Features</h3></div></div></div>
     <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>nsupdate</strong></span> and <span class="command"><strong>rndc</strong></span> now accept
+	  command line options <span class="command"><strong>-4</strong></span> and <span class="command"><strong>-6</strong></span>
+	  which force using only IPv4 or only IPv6, respectively. [RT #45632]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>nsec3hash -r</strong></span> ("rdata order") takes arguments
diff --git a/doc/arm/man.delv.html b/doc/arm/man.delv.html
index 6bcfcbf98d..aa719f5a5c 100644
--- a/doc/arm/man.delv.html
+++ b/doc/arm/man.delv.html
@@ -52,8 +52,10 @@
     <div class="cmdsynopsis"><p>
       <code class="command">delv</code> 
        [@server]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-a <em class="replaceable"><code>anchor-file</code></em></code>]
        [<code class="option">-b <em class="replaceable"><code>address</code></em></code>]
        [<code class="option">-c <em class="replaceable"><code>class</code></em></code>]
diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 384bb6807e..d0317e32e6 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -63,8 +63,10 @@
        [<code class="option">-v</code>]
        [<code class="option">-x <em class="replaceable"><code>addr</code></em></code>]
        [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]name:key</code></em></code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [name]
        [type]
        [class]
diff --git a/doc/arm/man.host.html b/doc/arm/man.host.html
index f0a3afc34e..8f4f155e5d 100644
--- a/doc/arm/man.host.html
+++ b/doc/arm/man.host.html
@@ -58,8 +58,10 @@
        [<code class="option">-t <em class="replaceable"><code>type</code></em></code>]
        [<code class="option">-W <em class="replaceable"><code>wait</code></em></code>]
        [<code class="option">-m <em class="replaceable"><code>flag</code></em></code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-v</code>]
        [<code class="option">-V</code>]
        {name}
diff --git a/doc/arm/man.lwresd.html b/doc/arm/man.lwresd.html
index 016a0982fd..024d7b2040 100644
--- a/doc/arm/man.lwresd.html
+++ b/doc/arm/man.lwresd.html
@@ -65,8 +65,10 @@
        [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>]
        [<code class="option">-u <em class="replaceable"><code>user</code></em></code>]
        [<code class="option">-v</code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
     </p></div>
   </div>
 
diff --git a/doc/arm/man.mdig.html b/doc/arm/man.mdig.html
index c636110556..7d2bbf4131 100644
--- a/doc/arm/man.mdig.html
+++ b/doc/arm/man.mdig.html
@@ -53,8 +53,10 @@
        [<code class="option">-f <em class="replaceable"><code>filename</code></em></code>]
        [<code class="option">-h</code>]
        [<code class="option">-v</code>]
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-m</code>]
        [<code class="option">-b <em class="replaceable"><code>address</code></em></code>]
        [<code class="option">-p <em class="replaceable"><code>port#</code></em></code>]
diff --git a/doc/arm/man.named.html b/doc/arm/man.named.html
index c1b0fb85b6..919d742d6d 100644
--- a/doc/arm/man.named.html
+++ b/doc/arm/man.named.html
@@ -51,8 +51,10 @@
 <h2>Synopsis</h2>
     <div class="cmdsynopsis"><p>
       <code class="command">named</code> 
-       [<code class="option">-4</code>]
-       [<code class="option">-6</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>]
        [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>]
        [<code class="option">-D <em class="replaceable"><code>string</code></em></code>]
diff --git a/doc/arm/man.nsupdate.html b/doc/arm/man.nsupdate.html
index 475475b4c3..8fe99bf0cf 100644
--- a/doc/arm/man.nsupdate.html
+++ b/doc/arm/man.nsupdate.html
@@ -69,6 +69,10 @@
        [<code class="option">-T</code>]
        [<code class="option">-P</code>]
        [<code class="option">-V</code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        [filename]
     </p></div>
   </div>
@@ -138,6 +142,18 @@
 
 
     <div class="variablelist"><dl class="variablelist">
+<dt><span class="term">-4</span></dt>
+<dd>
+	  <p>
+	    Use IPv4 only.
+	  </p>
+	</dd>
+<dt><span class="term">-6</span></dt>
+<dd>
+	  <p>
+	    Use IPv6 only.
+	  </p>
+	</dd>
 <dt><span class="term">-d</span></dt>
 <dd>
 	  <p>
diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index b568feabfd..1f2842595b 100644
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -60,6 +60,10 @@
        [<code class="option">-r</code>]
        [<code class="option">-V</code>]
        [<code class="option">-y <em class="replaceable"><code>key_id</code></em></code>]
+       [
+	[<code class="option">-4</code>]
+	 |  [<code class="option">-6</code>]
+      ]
        {command}
     </p></div>
   </div>
@@ -102,6 +106,18 @@
 
 
     <div class="variablelist"><dl class="variablelist">
+<dt><span class="term">-4</span></dt>
+<dd>
+	  <p>
+	    Use IPv4 only.
+	  </p>
+	</dd>
+<dt><span class="term">-6</span></dt>
+<dd>
+	  <p>
+	    Use IPv6 only.
+	  </p>
+	</dd>
 <dt><span class="term">-b <em class="replaceable"><code>source-address</code></em></span></dt>
 <dd>
 	  <p>
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 0c16274a38..a0d76bab54 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -192,6 +192,13 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_features"></a>New Features</h3></div></div></div>
     <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>nsupdate</strong></span> and <span class="command"><strong>rndc</strong></span> now accept
+	  command line options <span class="command"><strong>-4</strong></span> and <span class="command"><strong>-6</strong></span>
+	  which force using only IPv4 or only IPv6, respectively. [RT #45632]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>nsec3hash -r</strong></span> ("rdata order") takes arguments