diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
| commit | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (patch) | |
| tree | 2e1d6f54e62936792176caba483af8cc0907c755 /debian/changelog | |
| parent | fb82474be06f1be2c96bdfc231c3768cabe0d4eb (diff) | |
| parent | 8b577726ab3768d50ca7d3fdef240e37fe046fc2 (diff) | |
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 7a89ebf4b..420cef5ad 100644 --- 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,16 +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 ] - * 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. + * 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 |