X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6caed59b9c852836371f9542636da290350c0e8b..a41d8177d4769daf20ea88baddedcc3cbcd56c21:/doc/plugins/lockedit.mdwn?ds=sidebyside

diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index 07abce1af..c8f64ea47 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -4,7 +4,7 @@
 This plugin allows the administrator of a wiki to lock some pages, limiting
 who can edit them using the online interface. This doesn't prevent anyone
 who can commit to the underlying revision control system from editing the
-pages, however.
+pages, however. (Unless you set up [[tips/untrusted_git_push]].)
 
 The `locked_pages` setting configures what pages are locked. It is a
 [[ikiwiki/PageSpec]], so you have lots of control over what kind of pages
@@ -17,4 +17,12 @@ One handy thing to do if you're using ikiwiki for your blog is to lock
 posts in your blog, while still letting them comment via the Discussion
 pages.
 
-Wiki administrators can always edit locked pages.
+Alternatively, if you're using the [[comments]] plugin, you can lock
+"!postcomment(*)" to allow users to comment on pages, but not edit anything
+else.
+
+Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]]
+can specify that some pages are not locked for some users. For example,
+"important_page and !user(joey)" locks `important_page` while still
+allowing joey to edit it, while "!*/Discussion and user(bob)" prevents bob
+from editing pages except for Discussion pages.