Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / bugs / map_generates_malformed_HTML.mdwn

diff --git a/doc/bugs/map_generates_malformed_HTML.mdwn b/doc/bugs/map_generates_malformed_HTML.mdwn
index 967439635c2679813e1b9e08bd1c7bb3094a4787..890a6ef7fe790b94311fcc1d89ced8752bf34941 100644 (file)
--- a/doc/bugs/map_generates_malformed_HTML.mdwn
+++ b/doc/bugs/map_generates_malformed_HTML.mdwn
@@ -1,4 +1,5 @@
 [[!template id=gitbranch branch=smcv/ready/map author="[[Simon McVittie|smcv]]"]]
+[[!tag patch]]
 
 `\[[!map]]` can generate bad HTML with unbalanced open/close tags
 (in XML terms: "not well-formed") in certain situations. This
@@ -31,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]]