diff options
| -rw-r--r-- | doc/features.mdwn | 8 | ||||
| -rw-r--r-- | doc/page_locking.mdwn | 17 | ||||
| -rw-r--r-- | doc/plugins/lockedit.mdwn | 18 | ||||
| -rw-r--r-- | doc/todo/ACL.mdwn | 2 |
4 files changed, 22 insertions, 23 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn index e9be02be4..395ca0981 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -146,10 +146,10 @@ Thanks to subpages, every page can easily and automatically have a ### Edit controls -Wiki admins can [[lock_pages|page_locking]] so that only other admins can -edit them. Or a wiki can be set up to allow anyone to edit Discussion -pages, but only registered users to edit other pages. These are just two -possibilities, since page edit controls can be changed via plugins. +Wiki admins can lock_pages so that only other admins can edit them. Or a +wiki can be set up to allow anyone to edit Discussion pages, but only +registered users to edit other pages. These are just two possibilities, +since page edit controls can be changed via plugins. ### [[PageHistory]] diff --git a/doc/page_locking.mdwn b/doc/page_locking.mdwn deleted file mode 100644 index 21f4fb027..000000000 --- a/doc/page_locking.mdwn +++ /dev/null @@ -1,17 +0,0 @@ -The administrator of a wiki can choose to lock some pages, which allows -only the admin to 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. - -To lock a page, log into the wiki as whatever user is configured as the -admin, and in your Preferences page, you'll find a field listing locked -pages. This is a [[ikiwiki/PageSpec]], so you have a fair bit of control -over what kinds of pages to lock. For example, you could choose to lock all -pages created before 2006, or all pages that are linked to from the page -named "locked". More usually though, you'll just list some names of pages -to lock. - -One handy thing to do if you're using ikiwiki for your blog is to lock -"* and !*/Discussion". This prevents others from adding to or modifying -posts in your blog, while still letting them comment via the Discussion -pages. diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn index 01b0f157d..07abce1af 100644 --- a/doc/plugins/lockedit.mdwn +++ b/doc/plugins/lockedit.mdwn @@ -1,4 +1,20 @@ [[!template id=plugin name=lockedit core=1 author="[[Joey]]"]] [[!tag type/auth]] -This plugin enables [[page_locking]]. It is enabled by default. +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. + +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 +to lock. For example, you could choose to lock all pages created before +2006, or all pages that are linked to from the page named "locked". More +usually though, you'll just list some names of pages to lock. + +One handy thing to do if you're using ikiwiki for your blog is to lock +"* and !*/Discussion". This prevents others from adding to or modifying +posts in your blog, while still letting them comment via the Discussion +pages. + +Wiki administrators can always edit locked pages. diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn index fb496c518..373f89364 100644 --- a/doc/todo/ACL.mdwn +++ b/doc/todo/ACL.mdwn @@ -32,7 +32,7 @@ Also see [[!debbug 443346]]. > defined in the wiki pages (although they could be). >* Given the previous two points, can't this be done with the `match_user()` > function defined by the [[plugins/attachment]] plugin (see the [[ikiwiki/pagespec/attachment]] pagespec info) -> and the [[plugins/lockedit]] plugin (see [[page_locking]])? +> and the [[plugins/lockedit]] plugin? > > For example, add the following to your config file: > |