diff --git a/doc/bugs/pages_under_templates_are_invalid.mdwn b/doc/bugs/pages_under_templates_are_invalid.mdwn
new file mode 100644
index 000000000..da4ffb295
--- /dev/null
+++ b/doc/bugs/pages_under_templates_are_invalid.mdwn
@@ -0,0 +1,10 @@
+ages under templates/ are invalid (in fact, not only invalid, but also not well-formed) xhtml pages.
+
+This problem is especially serious when you change extension from .html to .xhtml in ikiwiki.setup and use Firefox. Since Firefox will display a error message only for not well-formed application/xhtml+xml pages.
+
+It seems that HTML::Template also support <!--Variable--> syntax instead of <Variable>.  Chaning to this syntax will solve this problem, I guess.
+
+
+Even if changed to <!-- TMPL_VAR --> style, the problem may still exist if the template contains if else block.
+
+Maybe just encode all &lt; and &gt; when compling pages within the templates folder will solve this problem.
diff --git a/doc/bugs/taint_issue_with_regular_expressions.mdwn b/doc/bugs/taint_issue_with_regular_expressions.mdwn
new file mode 100644
index 000000000..174b4f1c5
--- /dev/null
+++ b/doc/bugs/taint_issue_with_regular_expressions.mdwn
@@ -0,0 +1,9 @@
+Built from 2.1.17 source, works fine on commandline, but not working from CGI wrapper.  Traced problem to regular expressions failing to match, specifically in contexts like the following in Render.pm:
+
+    my ($f)=/$config{wiki_file_regexp}/; # untaint
+
+It works if I replace it with:
+
+    my ($f)=/(^[-[:alnum:]_.:\/+]+$)/; # untaint
+
+which is exactly the same regular expression drawn out as a constant.  It appears that %config gets some tainted data and is itself being marked entirely tainted, which may prevent using regular expressions contained in it for untainting other data.  I'm using Perl 5.8.8.
diff --git a/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn b/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn
new file mode 100644
index 000000000..9463cfb1b
--- /dev/null
+++ b/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn
@@ -0,0 +1,34 @@
+If you put in something such as undefined tags or mismatched tags in .mdwn file, ikiwiki will put &lt;p>&lt;/p> around them. But ikiwiki will NOT convert < and > to &amp;lt; and &amp;gt;! 
+
+     <section>
+
+     some text
+
+     </section>
+
+
+the output html
+
+    <p><section></p> <p>some text</p> <p></section></p> 
+
+And another example of mismatched tags:
+
+
+
+     <div>
+
+     some text
+
+     </div>
+     </div>
+
+
+The out put is:
+
+    <div>
+
+    some text
+
+    </div>
+
+    <p></div></p>
diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index d81163670..66b5eae06 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -15,7 +15,13 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
 
 > No such syntax exists in markdown.  ikiwiki could certainly have a
 > [[preprocessor_directive|preprocessordirective]] for it, though.
->
+> --[[JoshTriplett]]
+
+>> [[tag wishlist]]
+>> I'd like to implement such a thing.  Joey, what is this supposed to look like?
+>> `\[[anchor WHATEVER]]`?  --[[tschwinge]]
+
+
 > The lack of the `#foo` anchor in the anchor example on [[wikilink]]
 > definitely looks like a bug.  --[[JoshTriplett]]
 
@@ -27,3 +33,4 @@ Considering a hierarchy like `foo/bar/bar`, I had the need to link from the
 `foo/bar/bar` page to the `foo/bar` one.  It would have been convenient to
 simply write [[wikilink]]s like `\[[../bar]]` (or even just `\[[..]]`?), but
 this doesn't work, so I had to resort to using `\[[foo/bar]]` instead.
+--[[tschwinge]]
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index b2f64ca59..bf2ade883 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -48,7 +48,7 @@ Personal sites and blogs
 * [Adam  Shand's homepage](http://adam.shand.net/iki/)
 * [Recai Oktaş's homepage](http://kirkambar.net/) (uses [[rcs/Git]] backend, Turkish language only).
 * [Hess family wiki](http://kitenet.net/~family/)
-* [Stefano Zacchiroli's blog](http://www.bononia.it/~zack/blog/)
+* [Zack](http://upsilon.cc/~zack)'s homepage, including [his weblog](http://upsilon.cc/~zack/blog/)
 * [Taquiones: Victor Moral's personal website in Spanish](http://taquiones.net)
     * [Venexma Europa, S.L.](http://www.venexma.net): It's a small company dedicated to the distribution of shoe accessories. We use ikiwiki for development of internal applications (some areas are password protected). In spanish, of course.
 * [betacantrips, the personal website of Ethan Glasser-Camp](http://www.betacantrips.com/)
diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn
index 68b9b47ee..4714a7a09 100644
--- a/doc/todo/passwordauth:_sendmail_interface.mdwn
+++ b/doc/todo/passwordauth:_sendmail_interface.mdwn
@@ -34,6 +34,18 @@ in the ikiwiki source code, where emailing is done.
 
 OK, so I'll have a look at replacing all email handling with *Email::Send*.
 
+[[tag patch]]
+*<http://www.thomas.schwinge.homeip.net/tmp/ikiwiki-sendmail.patch>*
+
+Remaining TODOs:
+
+  * Resolve TODOs as denoted inside the patch.
+  * Is it worthwhile to use and depend on [[cpan Return::Value]]
+    just for this bit of functionality?
+  * Debian news file.
+  * ikiwiki news file.
+  * Are commit emails still working?
+
 --[[tschwinge]]