Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / fileupload.mdwn

diff --git a/doc/todo/fileupload.mdwn b/doc/todo/fileupload.mdwn
index 4623e4a5a10f8938fcb129ef433ab0607d47f5ea..8c9b18b19976a927ddd32a732cb0444508aaf036 100644 (file)
--- a/doc/todo/fileupload.mdwn
+++ b/doc/todo/fileupload.mdwn
@@ -1,3 +1,5 @@
+(I've written a [[proposal|todo/fileupload/soc-proposal]] for this feature --Ben).
+

 Support for uploading files is useful for many circumstances:
 
 * Uploading images.
 Support for uploading files is useful for many circumstances:
 
 * Uploading images.


@@ -52,4 +54,10 @@ That would obsolete the current simple admin prefs for banned users and
 locked pages. Suddenly all the access controls live in one place.
 Wonderbar!
 
 locked pages. Suddenly all the access controls live in one place.
 Wonderbar!
 

-[[tag soc]]
+(Note that pagespec_match will now return an object that stringifies to a
+message indicating why the pagespec matched, or failed to match, so if a
+pagespec lock like the above prevents an edit or upload from happening,
+ikiwiki could display a reasonable message to the user, indicating what
+they've done wrong.)
+
+[[!tag soc done]]