17 files changed, 34 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index c75eb80b7..31932d857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,11 @@ ikiwiki (1.5) UNRELEASED; urgency=low
       pages that link to my home page in the wiki"
     - Locking any pages that are linked to from a particular page, so that
       lists of locks can be exposed in the wiki.
+  * Reorganised the doc wiki's todo/* pages, using a [[done]] tag to flag
+    when a todo item is done, instead of the previous moving it to a different
+    subdir.
 
- -- Joey Hess <joeyh@debian.org>  Thu,  1 Jun 2006 20:56:58 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu,  1 Jun 2006 21:30:03 -0400
 
 ikiwiki (1.4) unstable; urgency=low
 
diff --git a/doc/download.mdwn b/doc/download.mdwn
index e64d1984c..fb8558794 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -21,3 +21,6 @@ The current development version of ikiwiki can be accessed using subversion at
 `svn://svn.kitenet.net/ikiwiki/trunk`
 
 The source in subversion can be browsed [with viewcvs](http://svn.kitenet.net/trunk/?root=ikiwiki).
+
+If you would like to be subscribed to svn commit messages for ikiwiki,
+mail joey@kitenet.net.
diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 4bf9eb4c0..814c87fc2 100644
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -1,9 +1,9 @@
-Welcome to ikiwiki's todo list. Items are moved to [[todo/done]] when done.
+Welcome to ikiwiki's todo list. Link items to [[todo/done]] when done.
 
-[[inline pages="todo/* !todo/done* !*/Discussion" rootpage="todo" show="30"]]
+[[inline pages="todo/* !todo/done !link(done) !*/Discussion" rootpage="todo" show="30"]]
 
 ----
 
 # Full list of open items:
 
-[[inline pages="todo/* !todo/done* !*/Discussion" archive="yes"]]
+[[inline pages="todo/* !todo/done !link(done) !*/Discussion" archive="yes"]]
diff --git a/doc/todo/done/1.0_release_blockers.mdwn b/doc/todo/1.0_release_blockers.mdwn
index 01ec8193b..c8ef70ebd 100644
--- a/doc/todo/done/1.0_release_blockers.mdwn
+++ b/doc/todo/1.0_release_blockers.mdwn
@@ -2,4 +2,6 @@ The following need to be resolved before ikiwiki 1.0 can be released:
 
 * HTML XSS [[security]] issues. Do I need to find or write a html sanitiser and bolt it onto the wiki, or can this stupid issue be ignored? It's really the browser's fault, and sanitising out html that is exploitable in all the buggy browsers out there is a neverending treadmill.
 
-That's all!
-\ No newline at end of file
+That's all!
+
+[[done]]
diff --git a/doc/todo/done/automatic_rebuilding_of_html_pages.mdwn b/doc/todo/automatic_rebuilding_of_html_pages.mdwn
index 931e1828f..20a7ead14 100644
--- a/doc/todo/done/automatic_rebuilding_of_html_pages.mdwn
+++ b/doc/todo/automatic_rebuilding_of_html_pages.mdwn
@@ -1,3 +1,5 @@
 It seems that pages like [[Todo]] aren't rebuilt automatically when a new item is added using the web interface.
 
-AFAIK this is working ok. For example, this page appears in [[TODO]]. Maybe you need to force-refresh the page in your web browser? --[[Joey]]
-\ No newline at end of file
+AFAIK this is working ok. For example, this page appears in [[TODO]]. Maybe you need to force-refresh the page in your web browser? --[[Joey]]
+
+[[done]]
diff --git a/doc/todo/done/blogs.mdwn b/doc/todo/blogs.mdwn
index 5322c7e43..4537a4fb5 100644
--- a/doc/todo/done/blogs.mdwn
+++ b/doc/todo/blogs.mdwn
@@ -1,2 +1,4 @@
 ikiwiki needs to support blogging. Make subpages of a page turn into a blog
 with a special post-processor rune.
+
+[[done]]
diff --git a/doc/todo/done.mdwn b/doc/todo/done.mdwn
index 3c17b90b6..c4bb7e1d9 100644
--- a/doc/todo/done.mdwn
+++ b/doc/todo/done.mdwn
@@ -1,3 +1,3 @@
 recently fixed [[TODO]] items
 
-[[inline pages="todo/done/* !*/Discussion" show="10"]]
+[[inline pages="todo/* link(done) !*/Discussion" show="10"]]
diff --git a/doc/todo/done/html.mdwn b/doc/todo/done/html.mdwn
deleted file mode 100644
index e74a979ca..000000000
--- a/doc/todo/done/html.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-# html validation
-
-  * A doctype: XHTML 1.0 strict.
-  * &lt;hr&gt; to &lt;hr /&gt; etc.
-  * Image wikilinks provide an alt text.
-  * &'s in (cgi-)url's escaped as &amp;amp;.	
diff --git a/doc/todo/done/htmlvalidation.mdwn b/doc/todo/htmlvalidation.mdwn
index 7e5db741d..1810a63d7 100644
--- a/doc/todo/done/htmlvalidation.mdwn
+++ b/doc/todo/htmlvalidation.mdwn
@@ -43,3 +43,5 @@
 
 This page is now valid.
 Test: [validate this page](http://validator.w3.org/check?url=referer)
+
+[[done]]
diff --git a/doc/todo/done/logo.mdwn b/doc/todo/logo.mdwn
index 3960c646b..7436d7efc 100644
--- a/doc/todo/done/logo.mdwn
+++ b/doc/todo/logo.mdwn
@@ -1,3 +1,4 @@
 ikiwiki needs a logo. I'm thinking something simple like the word "ikiwiki"
 with the first "k" backwards; drawn to show that it's "wiki" reflected.
 
+[[done]]
diff --git a/doc/todo/done/mailnotification.mdwn b/doc/todo/mailnotification.mdwn
index 50ecfe30b..28a63a935 100644
--- a/doc/todo/done/mailnotification.mdwn
+++ b/doc/todo/mailnotification.mdwn
@@ -55,3 +55,5 @@ should be safe. --[[WillThompson]])
 
   I'm deferring these nicities until there's some demonstrated demand
   --[[Joey]].
+
+[[done]]
diff --git a/doc/todo/done/search.mdwn b/doc/todo/search.mdwn
index cbbec7d97..4a94ac4a2 100644
--- a/doc/todo/done/search.mdwn
+++ b/doc/todo/search.mdwn
@@ -2,3 +2,4 @@
 * full text (use third-party tools?)
     - hyperestraier looks nice
 
+[[done]]
diff --git a/doc/todo/done/strftime.mdwn b/doc/todo/strftime.mdwn
index 305f833be..d68bed68f 100644
--- a/doc/todo/done/strftime.mdwn
+++ b/doc/todo/strftime.mdwn
@@ -1,2 +1,4 @@
 There should be a --strftime switch that controls how all the dates are
 formatted.
+
+[[done]]
diff --git a/doc/todo/done/underlay.mdwn b/doc/todo/underlay.mdwn
index 48e79498d..c8003b7f4 100644
--- a/doc/todo/done/underlay.mdwn
+++ b/doc/todo/underlay.mdwn
@@ -9,3 +9,5 @@ skip in the srcdir, and tricking it to processing this file instead of the
 one from the underlaydir. -- Fixed by scanning srcdir first, then
 underlaydir, and refusing to add any files from underlaydir if they also
 exist in the srcdir. However, see [[security]] for caveats.
+
+[[done]]
diff --git a/doc/todo/done/upgradehooks.mdwn b/doc/todo/upgradehooks.mdwn
index 90ef725ae..d7afa9d1b 100644
--- a/doc/todo/done/upgradehooks.mdwn
+++ b/doc/todo/upgradehooks.mdwn
@@ -4,3 +4,5 @@ this.
 
 Let there be an /etc/ikiwiki/wikis, which just lists setup files and the
 user who owns them. postinst loops through, su's, and runs --setup. Voila!
+
+[[done]]
diff --git a/doc/todo/done/utf8.mdwn b/doc/todo/utf8.mdwn
index b49bb3376..221f627e1 100644
--- a/doc/todo/done/utf8.mdwn
+++ b/doc/todo/utf8.mdwn
@@ -11,3 +11,5 @@ Notes:
 
 * Apache "AddDefaultCharset on" settings will not play well with utf-8
   pages. Turn it off.
+
+[[done]]
diff --git a/doc/todo/done/wikilinkfeatures.mdwn b/doc/todo/wikilinkfeatures.mdwn
index 782acf2af..5a2fa8433 100644
--- a/doc/todo/done/wikilinkfeatures.mdwn
+++ b/doc/todo/wikilinkfeatures.mdwn
@@ -1,3 +1,4 @@
 - \[[John|Fred]] is a Wikipedia method for linking to the one page
   while displaying it as the other, Kyle would like this.
 
+[[done]]