Merge branch 'master' into tova

4 files changed, 20 insertions, 6 deletions

diff --git a/doc/todo/Add_showdown_GUI_input__47__edit.mdwn b/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
index 4a20a37c7..a3db94bdd 100644
--- a/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
+++ b/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
@@ -13,3 +13,8 @@ A demo is at <http://www.attacklab.net/showdown-gui.html>
 
 > Since we have semi-working wikiwgy and it's better, I'm considering this
 > todo item as [[done]] or rather, will-not-be-done..
+
+>> Given the unfortunate state of affairs for the wikiwyg project, could it
+>> be worthwhile to consider this option again? It seems to have a companion
+>> product (wmd) with formatting widgets and a live preview pane, that is
+>> promised to be MIT licensed as of the next release.... --Chapman Flack
diff --git a/doc/todo/attachments.mdwn b/doc/todo/attachments.mdwn
index 08052f368..8c5c28615 100644
--- a/doc/todo/attachments.mdwn
+++ b/doc/todo/attachments.mdwn
@@ -1,7 +1,6 @@
 Stuff the [[plugins/attachment]] plugin is currently missing, that might be
 nice to add:
 
-* `mimetype()` pagespecs. (Using a mime type sniffer.)
 * Virus scanning.
 * Add a progress bar for attachment uploads (needs AJAX stuff..)
 * Maybe optimise the "Insert Links" button with javascript, so, if
diff --git a/doc/todo/comment_by_mail.mdwn b/doc/todo/comment_by_mail.mdwn
index a1d364f11..ed9db0621 100644
--- a/doc/todo/comment_by_mail.mdwn
+++ b/doc/todo/comment_by_mail.mdwn
@@ -62,3 +62,8 @@ Any comments? Write them here or send them to [[DavidBremner]]
 >>[test](mailto:bremner@somewhere.ca?body=X-Iki-Page:%20test%0AX-Iki-thread:%20foobar).  I hesitate to use the subject because every mail admin in the 
 >> world seems to want to add things to the front of it. 
 >> -- [[DavidBremner]]
+>>> 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 :-)  --[[David Bremner]]
diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn
index cea64e951..cbf969471 100644
--- a/doc/todo/wikiwyg/discussion.mdwn
+++ b/doc/todo/wikiwyg/discussion.mdwn
@@ -75,7 +75,7 @@ changes.diff:
       /usr/share/ikiwiki/wikiwyg/ for the files.
 * When is the WIKIWYG variable in misc.tmpl used?
   * The WIKIWYG variable in misc.tmpl is used for the edit page. I believe that is what
-    you wanted me to do (Check [Revision 3840][]).
+    you wanted me to do (Check Revision 3840).
     * Ah, right.
 * Could you move the code that handles saving a page of the page into the
   plugin? I just added an editcontent hook, which should allow you to do
@@ -153,10 +153,6 @@ Even just some of the smaller changes would be much easier for you to
 do than for me, and it would be nice to get them sorted out before I
 merge it into ikiwiki. --[[Joey]
 
-
-[Revision 3840]: http://ikiwiki.info/cgi-bin/viewvc.cgi?view=rev&root=ikiwiki&revision=3840
-
-
 None of the links for the WYSIWYG editor work anymore.  Does anyone have an up to date link?
 Thanks, [[Greg]]
 
@@ -170,3 +166,12 @@ Thanks, [[Greg]]
 >> wikiwyg-specific stuff from git, it looks like I'd need to ask git for
 >> a diff between the wikiwyg branch and its branch point; is there a nice way to do
 >> that with gitweb, or would I need to install a full-fledged git client? --Chapman Flack
+
+>>> I think that the largest missing thing was support for using ikiwiki
+>>> to render page previews.
+>>>
+>>> Erm.. I seem to have screwed up the creation or pushing out of the
+>>> wikiwyg branch. It doesn't seem to have any of the wikiwyg changes in
+>>> it, and at this point, I don't know where to find them anymore! Damn,
+>>> damn, damn. I suspect I did that right when I was learning git, and
+>>> screwed up pushing the branch. :-( --[[Joey]]