Merge remote branch 'upstream/master' into anonpush

diff --git a/doc/forum/lockedit:_pages_don__39__t_get_locked/comment_4_d0de7964db26cb6f3e81d6e8c29d860d._comment b/doc/forum/lockedit:_pages_don__39__t_get_locked/comment_4_d0de7964db26cb6f3e81d6e8c29d860d._comment
new file mode 100644 (file)
index 0000000..b97f44e
--- /dev/null
+++ b/doc/forum/lockedit:_pages_don__39__t_get_locked/comment_4_d0de7964db26cb6f3e81d6e8c29d860d._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 4"
+ date="2011-05-26T15:08:10Z"
+ content="""
+    locked_pages => 'todo and todo/done and index and ikiwiki/*',
+
+I didn't spot it before, but this is wrong: you want \"or\"
+instead of \"and\".
+
+It's a condition under which pages are to be locked: you're trying
+to lock all pages that are simultaneously todo, todo/done and some
+other names, which is an impossible condition to satisfy, so nothing
+is locked!
+"""]]