From: Tinderbox User <tbox@isc.org>
Date: Sun, 27 Dec 2015 01:04:16 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.11.0a1~231
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=428a763a70d288d5ad993a08abbbd923e2260be1;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 4a493207957..e503e17eb3d 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -667,6 +667,12 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>
+	  Some of the options for GeoIP ACLs, including "areacode",
+	  "metrocode", and "timezone", were incorrectly documented
+	  as "area", "metro" and "tz".  Both the long and abbreviated
+	  versions are now accepted.
+	</p></li>
 <li class="listitem"><p>
 	  <span class="command"><strong>dig</strong></span>, <span class="command"><strong>host</strong></span> and
 	  <span class="command"><strong>nslookup</strong></span> aborted when encountering
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 07e5a0bd399..1e7e8bc04eb 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -628,6 +628,12 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>
+	  Some of the options for GeoIP ACLs, including "areacode",
+	  "metrocode", and "timezone", were incorrectly documented
+	  as "area", "metro" and "tz".  Both the long and abbreviated
+	  versions are now accepted.
+	</p></li>
 <li class="listitem"><p>
 	  <span class="command"><strong>dig</strong></span>, <span class="command"><strong>host</strong></span> and
 	  <span class="command"><strong>nslookup</strong></span> aborted when encountering