From 00d23a23ebf0b54f775bd37c545cde4db1ae048a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Mar 2013 18:30:27 -0400
Subject: [PATCH] map: Correct reversion introduced in version 3.20110225 that
 could generate invalid html. (smcv)

---
 debian/changelog                           | 2 ++
 doc/bugs/map_generates_malformed_HTML.mdwn | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 54e7c9024..1657ffcb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20130213) UNRELEASED; urgency=low
   * Allow dots in directive parameter names. (tango)
   * Add missing plugin section, and deal with missing sections with a warning.
   * Detect plugins with a broken getsetup and warn.
+  * map: Correct reversion introduced in version 3.20110225 that could
+    generate invalid html. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 15 Feb 2013 17:23:12 -0400
 
diff --git a/doc/bugs/map_generates_malformed_HTML.mdwn b/doc/bugs/map_generates_malformed_HTML.mdwn
index e094264f4..890a6ef7f 100644
--- a/doc/bugs/map_generates_malformed_HTML.mdwn
+++ b/doc/bugs/map_generates_malformed_HTML.mdwn
@@ -32,3 +32,5 @@ HTML with redundant `</ul><ul>` pairs, marks the redundant
 pairs, and edits them out afterwards - but it works. If anyone can come
 up with a cleaner algorithm that avoids generating the redundant tags
 in the first place, that would be even better. --[[smcv]]
+
+> [[merged|done]] (not thrilled at this solution, but it works) --[[Joey]]