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

diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index 8394ce6287c5c4feb69b81d78c09caf90001e727..c58c30c3676d874e758666bc0c4c3170f636af17 100644 (file)
--- a/doc/todo/mbox.mdwn
+++ b/doc/todo/mbox.mdwn
@@ -5,9 +5,7 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 >> The 
 >> [mailbox](http://pivot.cs.unb.ca/git/?p=ikimailbox.git;a=summary) 
 >> plugin is roughly feature complete at this point.  It can read mbox, maildir, and
->> MH folders, does threading, and deals with MIME. Well, blindly decodes and copies 
->> to ikiwiki all of 
->> the MIME parts. Some sanity checking is clearly needed. It looks like attachement.pm has some code
->> that may be helpful.   No doubt lots of things could be 
+>> MH folders, does threading, and deals with MIME (now with 
+>> pagespec based sanity checking).  No doubt lots of things could be 
 >> be improved, and it hasn't been tested a great deal. Formatting of the body could be attempted
 >> as well. -- [[DavidBremner]]

diff --git a/doc/todo/table_with_header_column.mdwn b/doc/todo/table_with_header_column.mdwn
index a729ffaebe11489397b048111ab618203f9434ef..e9fad9c540f42267723c9faf4a8d644565aa0199 100644 (file)
--- a/doc/todo/table_with_header_column.mdwn
+++ b/doc/todo/table_with_header_column.mdwn
@@ -4,4 +4,4 @@ Tables support a header row or no header, but do not support a header column.
 >
 > -- [[AlexandreDupas]]
 
->> [applied|done]]
+>> [[applied|done]]