summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/NEWS4
-rw-r--r--debian/changelog19
-rw-r--r--doc/roadmap.mdwn2
3 files changed, 20 insertions, 5 deletions
diff --git a/debian/NEWS b/debian/NEWS
index f9dfc3770..6fe70c9e4 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,6 @@
-ikiwiki (3.0) unstable; urgency=low
+ikiwiki (3.00) unstable; urgency=low
- The 3.0 release of ikiwiki changes several defaults and makes
+ The 3.0 release of ikiwiki changes several defaults and finishes
some transitions. You will need to modify your wikis to work with
ikiwiki 3.0. A document explaining the process is available
in </usr/share/doc/ikiwiki/html/tips/upgrade_to_3.0.html>
diff --git a/debian/changelog b/debian/changelog
index 2c8931735..ff1c6aa5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-ikiwiki (2.72) UNRELEASED; urgency=low
+ikiwiki (3.00) UNRELEASED; urgency=low
+
+ * Remove support for GlobLists.
+ * Remove support for configuring allowed attachments, locked pages,
+ and banned users from the admin preferences page. These can only be
+ controlled via the setup file now.
+ * ikiwiki-transition moveprefs can be used to move the above
+ admin preferences into a setup file.
+ * prefix_directives and aggregate_internal are now turned on by default.
+ * ikiwiki-transition prefix_directives syntax changed
+ * googlecalendar: removed this deprecated plugin. Use embed instead.
+ * Version 3.00 of the plugin API.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:36 -0500
+
+ikiwiki (2.72) unstable; urgency=low
* Avoid comments in recentchanges being broken links (smcv)
* Add deprecation warning for GlobLists, which will stop working in 3.0.
- -- Joey Hess <joeyh@debian.org> Mon, 22 Dec 2008 19:02:16 -0500
+ -- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:32 -0500
ikiwiki (2.71) unstable; urgency=low
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 0f8cb00fc..83c654b5e 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -51,10 +51,10 @@ The highlights of the changes in version 3.0 include:
[[plugins/cutpaste]], [[plugins/hnb]], [[plugins/creole]], [[plugins/txt]],
[[plugins/amazon_s3]], [[plugins/pinger]], [[plugins/pingee]],
[[plugins/edittemplate]]
+* The RecentChanges page is compiled statically, not generated from the CGI.
* Support for additional revision control systems: [[rcs/bzr]],
[[rcs/monotone]]
* Support for [[tips/trusted_git_push]].
-* The RecentChanges page is compiled statically, not generated from the CGI.
* A new version (3.00) of the plugin API, exporting additional
commonly used functions from `IkiWiki.pm`. Nearly everything in ikiwiki is
now a plugin, from WikiLinks to page editing, to RecentChanges.