Merge branch 'master' into prefix-directives

Conflicts:

	debian/changelog
	templates/change.tmpl

6 files changed, 80 insertions, 4 deletions

diff --git a/doc/bugs/img_plugin_causes_taint_failure.mdwn b/doc/bugs/img_plugin_causes_taint_failure.mdwn
new file mode 100644
index 000000000..f8def19a0
--- /dev/null
+++ b/doc/bugs/img_plugin_causes_taint_failure.mdwn
@@ -0,0 +1,15 @@
+The img plugin causes a taint failure if one tries to link a scaled image, e.g.
+
+    \[[img foo.png size=64x64]]
+
+    .ikiwiki.setup: Insecure dependency in mkdir while running with -T switch at /usr/lib/perl5/vendor_perl/5.8.8/IkiWiki.pm line 360.
+    BEGIN failed--compilation aborted at (eval 5) line 109.
+
+If one omits the size argument it works. And if it worked once the taint failure will not happen again unless one rm -r's the destdir.
+
+Seen with ikiwiki 2.30
+
+> And what version of perl? See [[Insecure_dependency_in_mkdir]] et al.
+> Also, the debian build of ikiwiki has taint checking disabled to avoid
+> this perl bug. Did you build your own? Set NOTAINT=1 when building..
+> --[[Joey]]
diff --git a/doc/git.mdwn b/doc/git.mdwn
index 90f030ab4..6cbc1e489 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -21,11 +21,14 @@ own [[patches|patch]].
 Some of the branches included in the main repository include:
 
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-  die to license issues.
+  due to license issues.  Also some bits need to be tweaked to make it
+  work with the current *master* branch again.
 * `html` is an unfinished attempt at making ikiwiki output HTML 4.01
   instead of xhtml.
-* `prefix-directives` changes the preprocessor directive syntax. It
-  is approximately one failing test case away from merging.
+
+* `prefix-directives` changes the preprocessor directive syntax.
+  Passes all test cases; pending merge.
+
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `pristine-tar` contains deltas that
diff --git a/doc/news/version_2.31.mdwn b/doc/news/version_2.31.mdwn
new file mode 100644
index 000000000..d81e443a2
--- /dev/null
+++ b/doc/news/version_2.31.mdwn
@@ -0,0 +1,45 @@
+ikiwiki 2.31 released with [[toggle text="these changes"]]
+[[toggleable text="""
+ * [ 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
+     that contributes to a page's content and using the youngest of them all,
+     as well as special cases for things like the version plugin, and it's just
+     too complex to do.
+   * aggregate: Forking a child broke the one state that mattered: Forcing
+     the aggregating page to be rebuilt. Fix this.
+   * cgi hooks are now run before ikiwiki state is loaded.
+   * This allows locking the wiki before loading state, which avoids some
+     tricky locking code when saving a web edit.
+   * poll: This plugin turns out to have edited pages w/o doing any locking.
+     Oops. Convert it from a cgi to a sessioncgi hook, which will work
+     much better.
+   * recentchanges: Improve handling of links on the very static changes pages
+     by thunking to the CGI, which can redirect to the page, or allow it to be
+     created if it doesn't exist.
+   * recentchanges: Exipre all *.\_change pages, even if the directory
+     they're in has changed.
+   * aggregate: Lots of changes; aggregation can now run without locking the
+     wiki, and there is a separate aggregatelock to prevent multiple concurrent
+     aggregation runs.
+   * monotone changes by Brian May:
+     - On commits, replace "mtn sync" bidirectional with "mtn push" single
+       direction. No need to pull changes when doing a commit. mtn sync
+       is still called in rcs\_update.
+     - Support for viewing differences via patches using viewmtn.
+   * inline: When previewing, still call will\_render on rss/atom files,
+     just avoid actually writing the files. This is necessary because ikiwiki
+     saves state after a preview (in case it actually *did* write files),
+     and if will\_render isn't called its security checks will get upset
+     when the page is saved. Thanks to Edward Betts for his help tracking this
+     tricky bug down.
+   * 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."""]]
\ No newline at end of file
diff --git a/doc/todo/ctime_on_blog_post_pages_.mdwn b/doc/todo/ctime_on_blog_post_pages_.mdwn
index 4fd099d9d..d75dcd932 100644
--- a/doc/todo/ctime_on_blog_post_pages_.mdwn
+++ b/doc/todo/ctime_on_blog_post_pages_.mdwn
@@ -3,3 +3,7 @@
 The user has to look at the history link to find when a blog item was posted.
 
 It would be nice if blog entry post pages could include the ctime. -- [[Edward_Betts]]
+
+> I've committed a change that adds a CTIME variable to page.tmpl. I left
+> it commented out in the default template, since it seems like a bit of
+> clutter to me. Good enough? --[[Joey]]
diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn
index 78da75c38..ef6f6cd59 100644
--- a/doc/todo/wikiwyg/discussion.mdwn
+++ b/doc/todo/wikiwyg/discussion.mdwn
@@ -155,3 +155,12 @@ merge it into ikiwiki. --[[Joey]
 
 
 [Revision 3840]: http://ikiwiki.info/cgi-bin/viewvc.cgi?view=rev&root=ikiwiki&revision=3840
+
+
+None of the links for the WYSIWYG editor work anymore.  Does anyone have an up to date link?
+Thanks, [[Greg]]
+
+> There's a branch in [[git]] for the wikiwyg stuff, which includes
+> the latest version I sucked in from TaylorKillian's svn repository before
+> it went offline. Disapponted that nothing seems to be moving here.
+> --[[Joey]]
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 8653c33c2..9b5435628 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,4 @@
 My watchlist:
 
-[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" sort="mtime" atom="yes"]]
+[[inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]]