Add CHANGES and release notes

diff --git a/CHANGES b/CHANGES
index 335b9b2b02b3b18b140e9255772249a788c6a1dc..7a6066f87d8f90f54260fac0bf3d140d3cf0d479 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+5239.  [func]          Change the json-c detection to pkg-config. [GL #855]
+
 5238.  [bug]           Fix a possible deadlock in TCP code. [GL #1046]
 
 5237.  [bug]           Recurse to find the root server list with 'dig +trace'.

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 732da2f8dad00ba3ac7f328b0a856639b1698cce..95ecf3c79e413b35076b56edf013a97f35f518df 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -159,6 +159,18 @@
          <command>dnssec-checkds</command>.
        </para>
       </listitem>
+      <listitem>
+       <para>
+         JSON-C is now the only supported library for enabling JSON
+         support for BIND statistics. The <command>configure</command>
+         option has been renamed from <command>--with-libjson</command>
+         to <command>--with-json-c</command>.  Use
+         <command>PKG_CONFIG_PATH</command> to specify a custom path to
+         the <command>json-c</command> library as the new
+         <command>configure</command> option does not take the library
+         installation path as an optional argument.
+       </para>
+      </listitem>
     </itemizedlist>
   </section>