X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb394fdae8ba488f1031d6f053f1544c689a3628..ea6dc3832585d8aca784c21d6f91436848a45039:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 033b9fbc6..5361d88f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,18 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * Large amounts of internal config data reorg.
   * The way wrappers are defined in the setup file has changed. Old setup
     files will continue to work, for now.
+  * ikiwiki-transition setupformat can be used to convert a setup file to the
+    new format.
   * Version control backends promoted to first-class plugins.
   * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
     always to add.
-  * The locked pages configuration is moving to a locked_pages option in the
-    setup file, and the allowed attachments configuration to
-    allowed_attachments. The admin prefs page can still be used for these, but
-    that's depreacted and will only be shown if there's currently a value.
+  * Start moving admin preferences from the web interface to the setup file.
+  * websetup: New plugin providing a setup form on the web.
+  * ikiwiki-makerepo: Bail if both srcdir and repository are not specified.
+    Closes: #493628
+  * Clarify some wording in the setup documentation that could maybe lead
+    users to putting paths with "~/" in the setup file, which doesn't work.
+    Closes: #493835
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400