14 files changed, 20 insertions, 13 deletions
diff --git a/doc/todo/1.0_release_blockers.mdwn b/doc/todo/1.0_release_blockers.mdwn
index c8ef70ebd..0312155cf 100644
--- a/doc/todo/1.0_release_blockers.mdwn
+++ b/doc/todo/1.0_release_blockers.mdwn
@@ -4,4 +4,4 @@ The following need to be resolved before ikiwiki 1.0 can be released:
 
 That's all!
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/blogs.mdwn b/doc/todo/blogs.mdwn
index 4537a4fb5..8c9cba593 100644
--- a/doc/todo/blogs.mdwn
+++ b/doc/todo/blogs.mdwn
@@ -1,4 +1,4 @@
 ikiwiki needs to support blogging. Make subpages of a page turn into a blog
 with a special post-processor rune.
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/done.mdwn b/doc/todo/done.mdwn
index f139349ea..847d0a2e5 100644
--- a/doc/todo/done.mdwn
+++ b/doc/todo/done.mdwn
@@ -1,3 +1,3 @@
 recently fixed [[TODO]] items
 
-[[inline pages="link(done) !*/Discussion" show="10"]]
+[[inline pages="link(todo/done) !todo !*/Discussion" show="10"]]
diff --git a/doc/todo/htmlvalidation.mdwn b/doc/todo/htmlvalidation.mdwn
index 1810a63d7..6fe2d56f2 100644
--- a/doc/todo/htmlvalidation.mdwn
+++ b/doc/todo/htmlvalidation.mdwn
@@ -44,4 +44,4 @@
 This page is now valid.
 Test: [validate this page](http://validator.w3.org/check?url=referer)
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/lists.mdwn b/doc/todo/lists.mdwn
index 912666cd7..4fc3e68b4 100644
--- a/doc/todo/lists.mdwn
+++ b/doc/todo/lists.mdwn
@@ -1,3 +1,3 @@
 * list of all missing pages
 
-  [[done]]
+  [[todo/done]]
diff --git a/doc/todo/logo.mdwn b/doc/todo/logo.mdwn
index 7436d7efc..616720e44 100644
--- a/doc/todo/logo.mdwn
+++ b/doc/todo/logo.mdwn
@@ -1,4 +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]]
+[[todo/done]]
diff --git a/doc/todo/mailnotification.mdwn b/doc/todo/mailnotification.mdwn
index 28a63a935..37fe9a55a 100644
--- a/doc/todo/mailnotification.mdwn
+++ b/doc/todo/mailnotification.mdwn
@@ -56,4 +56,4 @@ should be safe. --[[WillThompson]])
   I'm deferring these nicities until there's some demonstrated demand
   --[[Joey]].
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/search.mdwn b/doc/todo/search.mdwn
index 4a94ac4a2..79342f286 100644
--- a/doc/todo/search.mdwn
+++ b/doc/todo/search.mdwn
@@ -2,4 +2,4 @@
 * full text (use third-party tools?)
     - hyperestraier looks nice
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/strftime.mdwn b/doc/todo/strftime.mdwn
index d68bed68f..3c854391f 100644
--- a/doc/todo/strftime.mdwn
+++ b/doc/todo/strftime.mdwn
@@ -1,4 +1,4 @@
 There should be a --strftime switch that controls how all the dates are
 formatted.
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn
new file mode 100644
index 000000000..7f766f79c
--- /dev/null
+++ b/doc/todo/toplevel_index.mdwn
@@ -0,0 +1,7 @@
+Some inconsistences around the toplevel [[index]] page:
+
+* The page's title is "index"; the linkpath looks like "ikiwiki / index".
+  IMHO it would be nicer if the title were "ikiwiki" and the linkpath was
+  just "ikiwiki" (for this wiki).
+* [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
+  the [[index]] though.
diff --git a/doc/todo/underlay.mdwn b/doc/todo/underlay.mdwn
index c8003b7f4..9bcfea62b 100644
--- a/doc/todo/underlay.mdwn
+++ b/doc/todo/underlay.mdwn
@@ -10,4 +10,4 @@ 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]]
+[[todo/done]]
diff --git a/doc/todo/upgradehooks.mdwn b/doc/todo/upgradehooks.mdwn
index d7afa9d1b..47da73443 100644
--- a/doc/todo/upgradehooks.mdwn
+++ b/doc/todo/upgradehooks.mdwn
@@ -5,4 +5,4 @@ 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]]
+[[todo/done]]
diff --git a/doc/todo/utf8.mdwn b/doc/todo/utf8.mdwn
index 221f627e1..6d2798a41 100644
--- a/doc/todo/utf8.mdwn
+++ b/doc/todo/utf8.mdwn
@@ -12,4 +12,4 @@ Notes:
 * Apache "AddDefaultCharset on" settings will not play well with utf-8
   pages. Turn it off.
 
-[[done]]
+[[todo/done]]
diff --git a/doc/todo/wikilinkfeatures.mdwn b/doc/todo/wikilinkfeatures.mdwn
index 5a2fa8433..bf32dafbb 100644
--- a/doc/todo/wikilinkfeatures.mdwn
+++ b/doc/todo/wikilinkfeatures.mdwn
@@ -1,4 +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]]
+[[todo/done]]