From 7861801acbc2217ba04bb1858ac1a1a1e1feb661 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 10 Sep 2018 09:09:47 +1000
Subject: [PATCH] add CHANGES and release notes documentation

(cherry picked from commit f924c89f97ab819f7b6ba455db1a1d89596a66f9)
---
 CHANGES           | 3 +++
 doc/arm/notes.xml | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES b/CHANGES
index 500c74cab7..77bf88e64d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5032.	[func]		Add krb5-selfsub and ms-selfsub update policy rules.
+			[GL #511]
+
 5030.	[bug]		Align CMSG buffers to a 64-bit boundary, fixes crash
 			on architectures with strict alignment. [GL #521]
 
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 7b7475b58f..984c4f6977 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -128,6 +128,15 @@
 	  necessary.
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  Two new update policy rule types have been added
+	  <command>krb5-selfsub</command> and <command>ms-selfsub</command>
+	  which allow machines with Kerberos principals to update
+	  the name space at or below the machine names identified
+	  in the respective principals.
+	</para>
+      </listitem>
     </itemizedlist>
   </section>