Fix typo (thanks, Niels Thykier)

[debian/debian-policy.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7161430590a5ab3689db486fc22e7bfe19882a86..b7b3df0e652d4ed6b3bafaf451839a6a60314335 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,17 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Dominic Hargreaves <dom@earth.li>
     Seconded: Javier Fernández-Sanguino Peña <jfs@computer.org>
     Closes: #609162
+  * Policy: Document issues with conflicting packages sharing a conffile
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Cyril Brulebois <kibi@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Closes: #23712
+  * MIME Policy: Retire this document and merge it with Policy
+    Wording: Ben Finney <ben+debian@benfinney.id.au>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Closes: #89038
   * Consistently use "Debian source control file" for *.dsc files and
     "Source package control file" for debian/control files.  Patch from
     Charles Plessy.  (Closes: #626796)