map: Correct reversion introduced in version 3.20110225 that could generate invalid...

diff --git a/debian/changelog b/debian/changelog
index 54e7c902406792acfbd39f7cfe1f35ab3621687e..1657ffcb608c53c51be26462ee05569ac8b4cfaa 100644 (file)
--- 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 e094264f45504f7d32b6e123a335bae9a1d533a1..890a6ef7fe790b94311fcc1d89ced8752bf34941 100644 (file)
--- 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]]