From 0e29543a3d7030813b9b920431f5fe9410a7ad56 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Tue, 7 Nov 2017 21:42:32 +0000
Subject: [PATCH] regen master

---
 README               | 6 +++---
 bin/dig/dig.1        | 5 +++++
 bin/dig/dig.html     | 6 ++++++
 doc/arm/man.dig.html | 6 ++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 72e5e5d06e..371a2fdf8a 100644
--- a/README
+++ b/README
@@ -117,7 +117,7 @@ include:
   * 'named-checkconf -l' lists zones found in named.conf.
   * Added support for the EDNS Padding and Keepalive options.
   * 'new-zones-directory' option sets the location where the configuration
-    data for zones added by rndc addzone is stored
+    data for zones added by rndc addzone is stored.
   * The default key algorithm in rndc-confgen is now hmac-sha256.
   * filter-aaaa-on-v4 and filter-aaaa-on-v6 options are now available by
     default without a configure option.
@@ -131,8 +131,8 @@ on many versions of Linux and UNIX, including RedHat, Fedora, Debian,
 Ubuntu, SuSE, Slackware, FreeBSD, NetBSD, OpenBSD, Mac OS X, Solaris,
 HP-UX, AIX, SCO OpenServer, and OpenWRT.
 
-BIND is also available for Windows XP, 2003, 2008, and higher. See
-win32utils/readme1st.txt for details on building for Windows systems.
+BIND is also available for Windows 2008 and higher. See win32utils/
+readme1st.txt for details on building for Windows systems.
 
 To build on a UNIX or Linux system, use:
 
diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 47ad3652c0..1864ffd890 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -469,6 +469,11 @@ Convert [do not convert] puny code on output\&. This requires IDN SUPPORT to hav
 Ignore truncation in UDP responses instead of retrying with TCP\&. By default, TCP retries are performed\&.
 .RE
 .PP
+\fB+[no]keepalive\fR
+.RS 4
+Send [or do not send] an EDNS Keepalive option\&.
+.RE
+.PP
 \fB+[no]keepopen\fR
 .RS 4
 Keep the TCP socket open between queries and reuse it rather than creating a new TCP socket for each lookup\&. The default is
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 6c26f005f6..7ff4f59c93 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -628,6 +628,12 @@
 	      with TCP.  By default, TCP retries are performed.
 	    </p>
 	  </dd>
+<dt><span class="term"><code class="option">+[no]keepalive</code></span></dt>
+<dd>
+	    <p>
+	      Send [or do not send] an EDNS Keepalive option.
+	    </p>
+	  </dd>
 <dt><span class="term"><code class="option">+[no]keepopen</code></span></dt>
 <dd>
 	    <p>
diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index d8961855b5..332f8a4137 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -646,6 +646,12 @@
 	      with TCP.  By default, TCP retries are performed.
 	    </p>
 	  </dd>
+<dt><span class="term"><code class="option">+[no]keepalive</code></span></dt>
+<dd>
+	    <p>
+	      Send [or do not send] an EDNS Keepalive option.
+	    </p>
+	  </dd>
 <dt><span class="term"><code class="option">+[no]keepopen</code></span></dt>
 <dd>
 	    <p>
-- 
GitLab