summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-31 10:25:43 +0200
committerJoey Hess <joey@gnu.kitenet.net>2009-07-31 10:25:43 +0200
commitf1a70921e3bfc0496b5564582a5a1463b7a98c09 (patch)
tree5b4ece1ed99a2825b057edc9815e0f36bb7a7d11 /doc
parent0bbb3d201e9d3f27c537e415be4284877fd8eac7 (diff)
parente8770131740c83b21197d8a260db20c1c3f48020 (diff)
Merge commit 'remotes/smcv/ready/inline-pagenames' into staging
Diffstat (limited to 'doc')
-rw-r--r--doc/ikiwiki/directive/inline.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index 8afd65a05..9c55e07c2 100644
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -113,6 +113,11 @@ Here are some less often needed parameters:
For example, set "feedfile=feed" to cause it to generate `page/feed.atom`
and/or `page/feed.rss`. This option is not supported if the wiki is
configured not to use `usedirs`.
+* `pagenames` - If given instead of `pages`, this is interpreted as a
+ space-separated list of links to pages (with the same
+ [[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined
+ in exactly the order given: the `sort` and `pages` parameters cannot be used
+ in conjunction with this one.
[[!meta robots="noindex, follow"]]