merged

diff --git a/debian/changelog b/debian/changelog
index 7fd135700aef62b92e76edcb8dc5ddca2c8297b1..af94c99c59872b954696f0c2c9f518cf5e3b916e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ikiwiki (2.56) UNRELEASED; urgency=low
 
   * autoindex: New plugin that generates missing index pages.
     (Sponsored by The TOVA Company.)
+  * Escape HTML is rss and atom feeds instead of respectively using CDATA and
+    treating it as XHTML. This avoids problems with escaping the end of the
+    CDATA when the htmlscrubber is not used, and it avoids problems with atom
+    XHTML using named entity references that are not in the atom DTD. (Simon McVittie)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 29 Jul 2008 15:53:26 -0400
 

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))