Merge branch 'master' into tova

2 files changed, 11 insertions, 5 deletions

diff --git a/doc/todo/comment_by_mail.mdwn b/doc/todo/comment_by_mail.mdwn
index 085c4896f..6d3eeb044 100644
--- a/doc/todo/comment_by_mail.mdwn
+++ b/doc/todo/comment_by_mail.mdwn
@@ -46,8 +46,8 @@ Any comments? Write them here or send them to [[DavidBremner]]
 >> as a "moderation" interface.  After I killed a debian BTS entry with 
 >> clumsy pseudoheader editing I think any 
 >> reference info should also be encoded into the address.
->>> Although it is in python, just from reading the Debian ITP, it 
->>> looks like 
->>> [mnemosyne-blog](http://www.red-bean.com/~decklin/mnemosyne/)  
->>> might be an interesting backend to use or at least steal ideas 
->>> from :-)  --[[DavidBremner]]
+
+The current version of this plugin is now running on my home page. See for example
+[a recent post in my blog](http://www.cs.unb.ca/~bremner/blog/posts/can-i-haz-a-distributed-rss/).  
+Unfortunately although the [[mailbox|todo/mbox]] renderer supports threading, I haven't had 
+a chance to implement comments on comments yet. [[DavidBremner]]
diff --git a/doc/todo/softlinks.mdwn b/doc/todo/softlinks.mdwn
index 1e474185f..af99a9f82 100644
--- a/doc/todo/softlinks.mdwn
+++ b/doc/todo/softlinks.mdwn
@@ -4,3 +4,9 @@ The page "foo/" does not exist.
 This is too bad, because sometimes it is convenient to have several different names for the same page.
 
 Could softlinks be handled gracefully by ikiwiki?
+
+> Soft links are explicitly not handled by IkiWiki as a [[security]] measure.  If you want several names for
+> the same page, I suggest using the [[ikiwiki/directive/meta]] directive to make one page redirect to
+> another.  -- [[Will]]
+
+>> Will is right. I don't plan to support symlinks. [[done]] --[[Joey]]