diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
| commit | 041923a89ece8b1ed195cb7b528843c15770ea6f (patch) | |
| tree | d85f7c488c05d8d6983ec1b65b2e427c59cc3acf /debian | |
| parent | e12627e0a4c73d4d47ac2f10750defe22b41580e (diff) | |
| parent | 861dea7f1c720ff889ff11ef7b7e925a3c209c5d (diff) | |
| download | ikiwiki-041923a89ece8b1ed195cb7b528843c15770ea6f.tar ikiwiki-041923a89ece8b1ed195cb7b528843c15770ea6f.tar.gz | |
Merge branch 'master' into autoconfig
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4954c7737..440910313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,12 +14,18 @@ ikiwiki (2.60) UNRELEASED; urgency=low -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 -ikiwiki (2.56) UNRELEASED; urgency=low +ikiwiki (2.56) unstable; urgency=low * autoindex: New plugin that generates missing index pages. (Sponsored by The TOVA Company.) - - -- Joey Hess <joeyh@debian.org> Tue, 29 Jul 2008 15:53:26 -0400 + * 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) + * Add test for old versions of git that don't support --cleanup=verbatim, + and munge empty commit messages. + + -- Joey Hess <joeyh@debian.org> Thu, 31 Jul 2008 19:25:24 -0400 ikiwiki (2.55) unstable; urgency=low |