From: Josh Triplett <josh@freedesktop.org>
Date: Sun, 10 Feb 2008 07:02:52 +0000 (-0800)
Subject: Merge branch 'master' into prefix-directives
X-Git-Tag: 2.40~143
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/122f6df3259e8ca1dd96554d08cebce4b5c55acc?ds=inline;hp=--cc

Merge branch 'master' into prefix-directives

Conflicts:

	debian/changelog
	templates/change.tmpl
---

122f6df3259e8ca1dd96554d08cebce4b5c55acc
diff --cc debian/changelog
index 7a89ebf4b,b21cdb441..420cef5ad
--- a/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 184d8dc2d,803e8130a..e476a7439
--- a/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">