From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 23 Jul 2008 21:34:01 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/96dab37a8e3acc58fb0ab5be0657c0e545e9684a

Merge branch 'master' into tova
---

96dab37a8e3acc58fb0ab5be0657c0e545e9684a
diff --cc debian/changelog
index a0d526f88,2b216ca95..cfe168825
--- a/debian/changelog
+++ b/debian/changelog
@@@ -17,11 -11,8 +17,12 @@@ ikiwiki (2.55) UNRELEASED; urgency=lo
    * Add allow_symlinks_before_srcdir config setting that can be used to avoid
      a security check that is a good safe default, but problimatic overkill in
      some situations.
 +  * Don't allow uploading an attachment with the same name as an existing
 +    page, to avoid confusion.
 +  * Split out error messages from editpage.tmpl into several separate
 +    templates.
    * attachment: Do not escape _ when determining attachment filenames.
+   * Rebuild pages that change their type. (Gabriel McManus)
  
   -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400