regen master

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 4a49320795772600f16d41434a52958494a8f832..e503e17eb3d8e515c7b11dbd715a79b3cb9ec8e1 100644 (file)
--- 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 07e5a0bd399434ade2f081ff9ecc5012231423b5..1e7e8bc04ebecc29ec4270415eb6f8330b8dca5d 100644 (file)
--- 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