Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

doc/bugs/img_plugin_causes_taint_failure.mdwn

@@ -0,0 +1,10 @@
+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

doc/git.mdwn

@@ -25,8 +25,10 @@ Some of the branches included in the main repository include:
   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

doc/posts/second_post_why_not__63__.mdwn

@@ -0,0 +1 @@
+nothing special. just second one coz it was no second one before this one.

doc/todo/wikiwyg/discussion.mdwn

@@ -155,3 +155,7 @@ 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]]

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"]]