diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
| commit | f92505d78b82c6ac146e43054ebd12441575a602 (patch) | |
| tree | 2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/ikiwiki | |
| parent | fbe2ab4419e086ff84991bf25f1549aaabc5143b (diff) | |
| parent | 11f4942d68f3276bfdc4688e4091e559f9481874 (diff) | |
| download | ikiwiki-f92505d78b82c6ac146e43054ebd12441575a602.tar ikiwiki-f92505d78b82c6ac146e43054ebd12441575a602.tar.gz | |
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/ikiwiki')
| -rw-r--r-- | doc/ikiwiki/blog.mdwn | 10 | ||||
| -rw-r--r-- | doc/ikiwiki/pagespec.mdwn | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn index 8a9c50d0b..1a816dceb 100644 --- a/doc/ikiwiki/blog.mdwn +++ b/doc/ikiwiki/blog.mdwn @@ -52,10 +52,12 @@ directive: Set to 0 to show all matching pages. * `skip` - Specify a number of pages to skip displaying. Can be useful to produce a feed that only shows archived pages. -* `rss` - controls generation of an rss feed. On by default if the wiki is - configured to use rss feeds, set to "no" to disable. -* `atom` - controls generation of an atom feed. On by default if the wiki is - configured to use atom feeds, set to "no" to disable. +* `rss` - controls generation of an rss feed. If the wiki is configured to + generate tss feeds by default, set to "no" to disable. If the wiki is + configured to `allowrss`, set to "yes" to enable. +* `atom` - controls generation of an atom feed. If the wiki is configured to + generate atom feeds by default, set to "no" to disable. If the wiki is + configured to `allowatom`, set to "yes" to enable. * `feeds` - controls generation of all types of feeds. Set to "no" to disable generating any feeds. * `postform` - Set to "yes" to enables a form to post new pages to a [[blog]]. diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 5c6433ed3..3cd6bb9f4 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -33,8 +33,13 @@ functions: was created * "`created_before(page)`" - match only pages created before the given page was created -* "`user(name)`" - only available in page subscription preferences, match - only changes made by this user +* "`glob(someglob)`" - match pages that match the given glob. Just writing + the glob by itself is actually a shorthand for this function. +* "`internal(glob)`" - like `glob()`, but matches even internal-use + pages that globs do not usually match. +* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", + "`license(glob)`", "`copyright(glob)`" - match pages that have the given + metadata, matching the specified glob. For example, to match all pages in a blog that link to the page about music and were written in 2005: |