summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS12
-rw-r--r--debian/changelog5
2 files changed, 13 insertions, 4 deletions
diff --git a/debian/NEWS b/debian/NEWS
index 4aac33b80..0f9db4ea3 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+ikiwiki (2.60) unstable; urgency=low
+
+ Admin preferences are moving from the web interface to the setup file.
+ There are three new options in the setup file: locked_pages, banned_users,
+ and allowed_attachments. The admin prefs page can still be used, but
+ that's deprecated, and the prefs will be hidden if a value is not already
+ set. If a value is set in the web interface, you're encouraged to move that
+ setting to your setup file now, since version 3.0 will remove the deprecated
+ web interface.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 01 Aug 2008 17:02:14 -0400
+
ikiwiki (2.52) unstable; urgency=low
All wikis need to be rebuilt on upgrade to this version. If you listed your
diff --git a/debian/changelog b/debian/changelog
index 033b9fbc6..f40701691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
* 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.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400