[36877] added doc about geoip-directory

diff --git a/CHANGES b/CHANGES
index d89edd6286897a66df05a6e99e9e99603527dacd..c1b95319a809760414a3a8c5406643ba81f34108 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3926.  [doc]           Added doc for geoip-directory. [RT #36877]
+
 3925.  [bug]           DS lookup of RFC 1918 empty zones failed. [RT #36917]
 
 3924.  [bug]           Improve 'rndc addzone' error reporting. [RT #35187]

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 420801a9039f598bf90f06a0e78d5fb8ce961730..4d7c8c0aa9df3410014b4fd0770b2af0674f2dda 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4747,6 +4747,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     <optional> hostname <replaceable>hostname_string</replaceable>; </optional>
     <optional> server-id <replaceable>server_id_string</replaceable>; </optional>
     <optional> directory <replaceable>path_name</replaceable>; </optional>
+    <optional> geoip-directory <replaceable>path_name</replaceable>; </optional>
     <optional> key-directory <replaceable>path_name</replaceable>; </optional>
     <optional> managed-keys-directory <replaceable>path_name</replaceable>; </optional>
     <optional> named-xfer <replaceable>path_name</replaceable>; </optional>
@@ -5120,6 +5121,21 @@ badresp:1,adberr:0,findfail:0,valfail:0]
            </listitem>
          </varlistentry>
 
+         <varlistentry>
+           <term><command>geoip-directory</command></term>
+           <listitem>
+             <para>
+               Specifies the directory containing GeoIP
+               <filename>.dat</filename> database files for GeoIP
+               initialization.  By default, this option is unset
+               and the GeoIP support will use libGeoIP's
+               built-in directory.
+               (For details, see <xref linkend="acl"/> about the
+               <command>geoip</command> ACL.)
+             </para>
+           </listitem>
+         </varlistentry>
+
          <varlistentry>
            <term><command>key-directory</command></term>
            <listitem>