Merge branch 'joey' into revert

5 files changed, 30 insertions, 1 deletions

diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn
index 72bd1cfa2..e91a8923d 100644
--- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn
+++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn
@@ -50,3 +50,12 @@ Any suggestions gladly received. -- [[Jon]]
 
 >>> As always, if you'd like to mail me a larger test case that reproduces a
 >>> problem for you, I can take a look at it. --[[Joey]]
+
+>>>> <s>Thank you for the offer.  I might still take you up on it.  I've just proven that this
+>>>> does work for a clean repo / bare bones test case. -- [[Jon]]</s> Figured it out. The
+>>>> problem was I'd copied a page (old_new) which had two images embedded in it to test.
+>>>> I'd stored the images under a subdir "old_new". The new page was called "old_new_test"
+>>>> and the images thus could not be found by a pagespec "some-image.jpg". Adjusting the
+>>>> href argument to the template (consequently the src argument to img) to
+>>>> "old_new/some-image.jpg" fixed it all. [[done]], PEBKAC. Thank you for your time :)
+>>>> -- [[Jon]]
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 0e5a68740..c167388a7 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -47,7 +47,7 @@ included in the [[theme_plugin|plugins/theme]].
 * **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6].
 
 * **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays
-  the action list (Edit, RecentChanges, etc.) as tabs.
+  the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/).
   [[!meta stylesheet="actiontabs"]]
 
 * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
diff --git a/doc/sandbox/bullet_list_and_code_test.mdwn b/doc/sandbox/bullet_list_and_code_test.mdwn
new file mode 100644
index 000000000..a17729c90
--- /dev/null
+++ b/doc/sandbox/bullet_list_and_code_test.mdwn
@@ -0,0 +1,12 @@
+paragraph.
+
+    code
+
+ * bullet list
+ * bullet list
+
+    more code
+
+ * bullet list continued
+
+    tailing code
diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn
new file mode 100644
index 000000000..51991393e
--- /dev/null
+++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn
@@ -0,0 +1,6 @@
+[[!tag patch patch]]
+
+I was trying to get htmltidy to [play nicely with MathML][play].  Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line.  This seemed like a generally useful thing, so I've published my [patch][] as a Git branch.
+
+[play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html
+[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12
diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index 4363003c1..76bb69c9e 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -9,6 +9,8 @@ of the ikiwiki [[/logo]].
 
 > [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
 
+>> I've [updated](http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/) Jason's plugin for ikiwiki 3.x.  --W. Trevor King
+
 ----
 
 ikiwiki could also support LaTeX as a document type, again rendering to HTML.