X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2aa59621153fcba1d72d7c7688037f1fdfa7f95f..317c0275d81b7aa4f3f0848cd98ea86a2a975fdd:/doc/todo.mdwn?ds=inline

diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index d7326854e..30677fc42 100644
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -1,7 +1,5 @@
 ## online page editing
 
-* Missing conflict detection, just overwrites changes and does not svn up
-  first..
 * Eventually, might want page deletion.
 * Eventually, might want file upload.
 
@@ -27,6 +25,8 @@ is built. (As long as all changes to all pages is ok.)
      Joey points out that this is actually a security hole, because Perl
      regexes let you embed (arbitrary?) Perl expressions inside them.  Yuck!
 
+     It would also be good to be able to subscribe to all pages except discussion pages or the SandBox: `* !*/discussion !sandobx`, maybe --[[Joey]]
+
   3. Of course if you do that, you want to have form processing on the user
      page that lets them tune it, and probably choose literal or glob by
      default.
@@ -112,4 +112,10 @@ docs to use as a seed for new wikis.
 
 Might be nice to support automatically generating an index based on headers in a page, for long pages. The question is, how to turn on such an index?
 
+## page locking
+
+Some wikis will need the abiity to lock a page, or the whole wiki, so that only admins can edit them. Probably using the same globbing as for recentchanges mails to determine what to lock. 
+
+Probably it's ok if locking is only supported for web commits.
+
 ## [[Bugs]]