From ce0e242d21582cfd037221d8c3d62cc7a7b99eba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Feb 2008 16:06:50 -0500 Subject: [PATCH] update after merge --- debian/changelog | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 397ecca1b..7a89ebf4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,14 @@ ikiwiki (2.31) UNRELEASED; urgency=low 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. + [ 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. + -- Joey Hess Sat, 02 Feb 2008 23:36:31 -0500 ikiwiki (2.30) unstable; urgency=low @@ -55,12 +63,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 -- 2.26.2