* Detect the case of two people independently creating the same page at the

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 331a233fef205aaf3dbf6cd0c2f9739f234d3dfd..d76e05d7753b11c3939b734d4b94f2867e68a503 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,14 @@ ikiwiki (1.46) UNRELEASED; urgency=low
     blog post pages. The links will now create pages relative to the page that
     actually contains the link.
   * French update. Closes: #414597
-
- -- Joey Hess <joeyh@debian.org>  Mon, 12 Mar 2007 15:52:33 -0400
+  * 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.
+  * 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.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Mar 2007 19:56:04 -0400
 
 ikiwiki (1.45) unstable; urgency=low