Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / bugs / HTML_inlined_into_Atom_not_necessarily_well-formed.mdwn

diff --git a/doc/bugs/HTML_inlined_into_Atom_not_necessarily_well-formed.mdwn b/doc/bugs/HTML_inlined_into_Atom_not_necessarily_well-formed.mdwn
index 6c5c79672398f4bb843cc92c8afa9929a5b1e447..d2f8ca3dce4694dabe2866dce966d10778414aee 100644 (file)
--- a/doc/bugs/HTML_inlined_into_Atom_not_necessarily_well-formed.mdwn
+++ b/doc/bugs/HTML_inlined_into_Atom_not_necessarily_well-formed.mdwn
@@ -12,6 +12,8 @@ Possible solutions:
 >>> And the same content will be treated as html (probably as tag soup) if it's
 >>> in a rss feed.
 
+>>> [[merged|done]]
+
 * Keep HTML in Atom feeds as type="xhtml", but replace named entities with numeric ones,
   like in the re-escape-entities branch in my repository ([diff here](http://git.debian.org/?p=users/smcv/ikiwiki.git;a=commitdiff;h=c0eb041c65d0653bacf0d4acb7a602e9bda8888e))