diff options
| author | Joey Hess <joey@kitenet.net> | 2012-04-08 16:02:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-08 16:02:03 -0400 |
| commit | fc5c938b195bacd8db2be7a435cb88bfbd050af8 (patch) | |
| tree | 9f648f8cc74fe7340b40d80ba244bb7fbc800238 /doc | |
| parent | 29157c9cd1b3ad81bb76de5c99b21d27c25867d8 (diff) | |
| parent | 258ee1bc3b9c43807064c771ebcb9ce2840d4264 (diff) | |
| download | ikiwiki-fc5c938b195bacd8db2be7a435cb88bfbd050af8.tar ikiwiki-fc5c938b195bacd8db2be7a435cb88bfbd050af8.tar.gz | |
Merge remote-tracking branch 'smcv/ready/literal-pagenames'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki/directive/inline.mdwn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn index b2f1b5306..a9c241afc 100644 --- a/doc/ikiwiki/directive/inline.mdwn +++ b/doc/ikiwiki/directive/inline.mdwn @@ -113,10 +113,10 @@ Here are some less often needed parameters: 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. + space-separated list of absolute page names ([[SubPage/LinkingRules]] are + not taken into account), and they are inlined in exactly the order given: + the `sort` and `pages` parameters cannot be used in conjunction with + this one. * `trail` - If set to "yes" and the [[!iki plugins/trail desc=trail]] plugin is enabled, turn the inlined pages into a trail with next/previous links, by passing the same options to [[ikiwiki/directive/trailitems]]. The `skip` |