Merge branch 'master' of ssh://git.ikiwiki.info

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e7856c01b7d90886f46824b0f4e165b951e5cc62..1b0fd18ff656759b282898c04263c1cc36736d09 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,16 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
     refresh by querying git to find the files that were changed, rather
     than looking at the work tree. Not enabled by default as it can
     break some setups where not all files get committed to git.
+  * comments: Write pending moderation comments to the transient underlay
+    to avoid conflict with only_committed_changes.
+  * search: Added google_search option, which makes it search google
+    rather than using the internal xapain database.
+    (googlesearch plugin is too hard to turn on when xapain databases
+    corrupt themselves, which happens all too frequently).
+  * osm: Remove invalid use of charset on embedded javascript tags.
+    Closes: #731197
+  * style.css: Add compatability definitions for more block-level
+    html5 elements. Closes: #731199
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400