From: Michał Kępień <michal@isc.org>
Date: Wed, 11 Dec 2019 12:41:14 +0000 (+0100)
Subject: Prepare release notes for BIND 9.15.7
X-Git-Tag: v9.15.7~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c428479d6dc85be947cbc9336859b3392cdfe871;p=thirdparty%2Fbind9.git

Prepare release notes for BIND 9.15.7

  - Add a GitLab merge request number to the "trust-anchors" release
    note and slightly rephrase its second half.

  - Replace tabs with spaces in doc/arm/notes-9.15.7.xml to retain
    consistency with other XML files containing release notes.

  - Move the "Security Fixes" section for BIND 9.15.6 higher up, for
    consistency with release notes for other versions.
---

diff --git a/doc/arm/notes-9.15.6.xml b/doc/arm/notes-9.15.6.xml
index a67165326f2..b1b0952116d 100644
--- a/doc/arm/notes-9.15.6.xml
+++ b/doc/arm/notes-9.15.6.xml
@@ -11,6 +11,17 @@
 
 <section xml:id="relnotes-9.15.6"><info><title>Notes for BIND 9.15.6</title></info>
 
+  <section xml:id="relnotes-9.15.6-security"><info><title>Security Fixes</title></info>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Set a limit on the number of concurrently served pipelined TCP
+          queries. This flaw is disclosed in CVE-2019-6477. [GL #1264]
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
   <section xml:id="relnotes-9.15.6-new"><info><title>New Features</title></info>
     <itemizedlist>
       <listitem>
@@ -83,15 +94,4 @@
     </itemizedlist>
   </section>
 
-  <section xml:id="relnotes-9.15.6-security"><info><title>Security Fixes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          Set a limit on the number of concurrently served pipelined TCP
-          queries. This flaw is disclosed in CVE-2019-6477. [GL #1264]
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
 </section>
diff --git a/doc/arm/notes-9.15.7.xml b/doc/arm/notes-9.15.7.xml
index a6ce57b9d33..26f6dcdd356 100644
--- a/doc/arm/notes-9.15.7.xml
+++ b/doc/arm/notes-9.15.7.xml
@@ -15,16 +15,17 @@
     <itemizedlist>
       <listitem>
         <para>
-	  The <command>dnssec-keys</command> configuration statement,
-	  which was introduced in 9.15.1 and revised in 9.15.6, has now
-	  been renamed to the more descriptive
-	  <command>trust-anchors</command>.
+          The <command>dnssec-keys</command> configuration statement,
+          which was introduced in 9.15.1 and revised in 9.15.6, has now
+          been renamed to the more descriptive
+          <command>trust-anchors</command>. [GL !2702]
         </para>
         <para>
-	  (See the sections on
-	  <xref linkend="relnotes-9.15.6" xrefstyle="template:9.15.6"/> and
-	  <xref linkend="relnotes-9.15.1" xrefstyle="template:9.15.1"/>
-	  for prior discussion of this feature.)
+          (See release notes for
+          <xref linkend="relnotes-9.15.1-new" xrefstyle="template:BIND 9.15.1"/>
+          and
+          <xref linkend="relnotes-9.15.6-new" xrefstyle="template:BIND 9.15.6"/>
+          for prior discussion of this feature.)
         </para>
       </listitem>
     </itemizedlist>
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index b062a193c91..5913615e124 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -24,6 +24,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-platforms.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-download.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.15.7.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.15.6.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.15.5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes-9.15.4.xml"/>