diff --git a/doc/todo/fileupload.mdwn b/doc/todo/fileupload.mdwn
new file mode 100644
index 000000000..db5932de8
--- /dev/null
+++ b/doc/todo/fileupload.mdwn
@@ -0,0 +1,35 @@
+Support for uploading files is useful for many circumstances:
+
+* Uploading images.
+* Uploading local.css files (admin only).
+* Uploading mp3s for podcasts.
+* Etc.
+
+ikiwiki should have an easy to use interface for this, but the real meat of
+the work is in securing it. Several classes of controls seem appropriate:
+
+* Limits to size of files that can be uploaded. Prevent someone spamming
+  the wiki with CD isos..
+* Limits to the type of files that can be uploaded. To prevent uploads of
+  virii, css, raw html etc, and avoid file types that are not safe.
+  Should default to excluding all files types, or at least all
+  except a very limited set, and should be able to open it up to more
+  types.
+
+  Would checking for file extensions (.gif, .jpg) etc be enough? Some
+  browsers are probably too smart for their own good and may ignore the
+  extension / mime info and process as the actual detected file type. It
+  may be necessary to use `file` to determine a file's true type.
+* Limits to who can upload what type of files.
+* Limits to what files can be uploaded where.
+
+It seems that for max flexability, rules should be configurable by the admin
+to combine these limits in different ways. If we again extend the pagespec
+for this, as was done for [[conditional_text_based_on_ikiwiki_features]],
+the rules might look something like this:
+
+	( maxsize(30kb) and type(webimage) ) or
+	( user(joey) and maxsize(1mb) and (type(webimage) or *.mp3) ) or
+	( user(joey) and maxsize(200mb) and (*.mov or *.avi) and videos/*)
+
+[[tag soc]]
diff --git a/doc/todo/onlinepageediting.mdwn b/doc/todo/onlinepageediting.mdwn
deleted file mode 100644
index f343f764d..000000000
--- a/doc/todo/onlinepageediting.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-* Eventually, might want page deletion.
-* Eventually, might want file upload.
-* Page move? Link corrections?
-
->(I left this comment in discussion, but it might be better here on the main page)  This is a function I would really like.  I am dealing with a situation, in creating a link for my family history, for instance to "Peter Richard MacLea (1888-c.1946)" and fleshing out an article with pictures and so on.  Then, I later find out that Peter died in 1948.  So, I want to move that page to "Peter Richard MacLea (1888-1948)".  There doesn't seem to be an easy way to do this.  The main problem being that I can easily create a second page with that data, but what happens to the old one?  Does it remain?  I would like to see at least a rename or page move function.... *[Kyle](http://kitenet.net/~kyle/family/wiki/)=*
-
-[[tag soc]]
diff --git a/doc/todo/onlinepageediting/discussion.mdwn b/doc/todo/onlinepageediting/discussion.mdwn
deleted file mode 100644
index c3a92a609..000000000
--- a/doc/todo/onlinepageediting/discussion.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a function I would really like.  I am dealing with a situation, in creating a link for my family history, for instance to "Peter Richard MacLea (1888-c.1946)" and fleshing out an article with pictures and so on.
-Then, I later find out that Peter died in 1948.  So, I want to move that page to "Peter Richard MacLea (1888-1948)".  There doesn't seem to be an easy way to do this.  The main problem being that I can easily create a second page with that data, but what happens to the old one?  Does it remain?
-
-I would like to see at least a rename or page move function....
-
-*[Kyle](http://kitenet.net/~kyle/family/wiki/)=*
\ No newline at end of file
diff --git a/doc/todo/pagedeletion.mdwn b/doc/todo/pagedeletion.mdwn
new file mode 100644
index 000000000..49f84c952
--- /dev/null
+++ b/doc/todo/pagedeletion.mdwn
@@ -0,0 +1 @@
+It would be nice to be able to delete pages online.