aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-04 14:13:26 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-04 14:13:26 -0400
commitc427ab7ccbe6c5fe43602a724bbeab454d50195c (patch)
treeb69b11b3f86e89ccc86e3ecaee0e62e4e438c3af
parentd2679de965a0300474341139871855bbccc61612 (diff)
parentcf125ba1b290eb61eccb12260c9b6cb216866804 (diff)
downloadikiwiki-c427ab7ccbe6c5fe43602a724bbeab454d50195c.tar
ikiwiki-c427ab7ccbe6c5fe43602a724bbeab454d50195c.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/todo/mbox.mdwn6
-rw-r--r--doc/todo/table_with_header_column.mdwn2
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index 8394ce628..c58c30c36 100644
--- 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 a729ffaeb..e9fad9c54 100644
--- 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]]