Merge branch 'master' into prefix-directives

Conflicts:

	debian/changelog
	templates/change.tmpl

diff --cc debian/changelog
index 7a89ebf4bb87a4ea3dc09a7f544fb7e74bdff7e3,b21cdb4419905119277620d732a7937e98a5d417..420cef5ad9e0e3a440936f756b4b78c9fc693fdd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +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

diff --cc templates/change.tmpl
index 184d8dc2d94f116b905bdb78e4cc5827db4ca08d,803e8130a39199cd5872c65ad57771e58282a210..e476a7439b65c20e0ee37e6fb9ddccf3ee2f5b0c
--- 1/templates/change.tmpl
--- 2/templates/change.tmpl
+++ b/templates/change.tmpl
@@@ -1,8 -1,8 +1,8 @@@
 -[[meta author="""<TMPL_VAR AUTHOR>"""]]
 +[[!meta author="""<TMPL_VAR AUTHOR>"""]]
  <TMPL_IF AUTHORURL>
 -[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 +[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
  </TMPL_IF>
- [[!meta title="""update of <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]]
 -[[meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
++[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
  <div class="metadata">
  <span class="desc"><br />Changed pages:</span>
  <span class="pagelinks">