diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2013-07-17 16:49:46 -0400 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2013-07-17 16:49:46 -0400 |
| commit | 5c0a18e75a5bf9d6ce9da3a1a525117fe9ee8e47 (patch) | |
| tree | 9d0f5e33e2eb93dbda3f22d92af4e04e55c2ea84 /doc/ikiwiki | |
| parent | 83e5069aab99dfec9d0ee581b3d68583f5b14834 (diff) | |
| parent | ac386bc7b69a8bf946918c0b46533975d249cf97 (diff) | |
| download | ikiwiki-5c0a18e75a5bf9d6ce9da3a1a525117fe9ee8e47.tar ikiwiki-5c0a18e75a5bf9d6ce9da3a1a525117fe9ee8e47.tar.gz | |
Merge branch 'master' into fancypodcast
Conflicts:
doc/todo/fancypodcast.mdwn
Diffstat (limited to 'doc/ikiwiki')
| -rw-r--r-- | doc/ikiwiki/pagespec.mdwn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index fe1af4c15..0f298ad78 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -51,7 +51,8 @@ Some more elaborate limits can be added to what matches using these functions: * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the - specified IP address. + specified IP address. Glob patterns can be used in the address. For + example, `ip(127.0.0.*)` * "`comment(glob)`" - matches comments to a page matching the glob. * "`comment_pending(glob)`" - matches unmoderated, pending comments. * "`postcomment(glob)`" - matches only when comments are being |