forgot to revert this

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2a09196e2f6fc3264d8cb34221efb2ba6e5258bf..86815828a7038d05369cd3b34e3b5ec679ed5f65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (1.46) UNRELEASED; urgency=low
+ikiwiki (1.46) unstable; urgency=low
 
   * Fix a bug with inlined create page links, including Discussion links on
     blog post pages. The links will now create pages relative to the page that
@@ -6,8 +6,16 @@ ikiwiki (1.46) UNRELEASED; urgency=low
   * French update. Closes: #414597
   * Fix some broken logic in cgi creation of a subpage when a toplevel page
     with the same name already exists, and generally simplify the edit code.
-
- -- Joey Hess <joeyh@debian.org>  Sat, 17 Mar 2007 18:25:59 -0400
+  * Make ikiwiki -verbose -setup with a setup file that enabled syslog logging
+    output the verbose build log to stdout, rather than to the syslog.
+  * Detect the case of two people independently creating the same page at the
+    same time, and let the second person resolve the conflict.
+  * Applied a patch from Michał to make the mercurial backend pass --quiet to
+    hg.
+  * Fix a security hole that allowed a web user to insert
+    arbitrary html in the title of a page due to missing escaping.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2007 01:51:30 -0400
 
 ikiwiki (1.45) unstable; urgency=low