Merge branch 'master' into prefix-directives

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 397ecca1b0107c58a26f54b32fd31d6619c9f188..420cef5ad9e0e3a440936f756b4b78c9fc693fdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,18 @@
-ikiwiki (2.31) UNRELEASED; urgency=low
+ikiwiki (2.40) UNRELEASED; urgency=low
 
+  [ Josh Triplett ]
+  * Add new preprocessor directive syntax¸ using a '!' prefix.  Add a
+    prefix_directives option to the setup file to turn this syntax on;
+    currently defaults to false, for backward compatibility.  Support
+    optional '!' prefix even with prefix_directives off, and use that in
+    the underlay to support either setting of prefix_directives.  Add NEWS
+    entry with migration information.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sat, 09 Feb 2008 23:01:19 -0800
+
+ikiwiki (2.31) unstable; urgency=low
+
+  [ Joey Hess ]
   * Revert preservation of input file modification times in output files,
     since this leads to too many problems with web caching, especially with
     inlined pages. Properly solving this would involve tracking every page
@@ -36,8 +49,15 @@ ikiwiki (2.31) UNRELEASED; urgency=low
   * inline: Add new `allowrss` and `allowatom` config options. These can be
     used if you want a wiki that doesn't default to generating rss or atom
     feeds, but that does allow them to be turned on for specific blogs.
+  * Don't die if running with --getctime and rcs_getctime throws an error.
+    There are several cases (recentchanges files, aggregated files)
+    where some source files are not in revision control.
+  * Page templates can now use CTIME to show when the page was created.
+
+  [ Josh Triplett ]
+  * README.Debian: Mention user wikilists.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 02 Feb 2008 23:36:31 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 09 Feb 2008 23:09:45 -0500
 
 ikiwiki (2.30) unstable; urgency=low
 
@@ -55,12 +75,6 @@ ikiwiki (2.30) unstable; urgency=low
   [ Josh Triplett ]
   * Add trailing comma to commented-out umask in sample ikiwiki.setup, so
     that uncommenting it does not break the setup file.
-  * Add new preprocessor directive syntax¸ using a '!' prefix.  Add a
-    prefix_directives option to the setup file to turn this syntax on;
-    currently defaults to false, for backward compatibility.  Support
-    optional '!' prefix even with prefix_directives off, and use that in
-    the underlay to support either setting of prefix_directives.  Add NEWS
-    entry with migration information.
 
   [ Joey Hess ]
   * inline: The template can check for FIRST and LAST, which will be