Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / ikiwiki / directive / trailitems.mdwn

diff --git a/doc/ikiwiki/directive/trailitems.mdwn b/doc/ikiwiki/directive/trailitems.mdwn
index b1ba8d356fc40d68e27ca86926fef424fb62f219..387b403b9f6b8cbee7637d5e0937a7f287161d19 100644 (file)
--- a/doc/ikiwiki/directive/trailitems.mdwn
+++ b/doc/ikiwiki/directive/trailitems.mdwn
@@ -12,9 +12,10 @@ Options are similar to [[!iki ikiwiki/directive/inline desc=inline]]:
 * `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail
   (cannot be used with `pagenames`)
 
-* `pagenames`: adds a space-separated list of pages to the trail,
-  with the same [[ikiwiki/SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]]
-  (cannot be used with `pages`)
+* `pagenames`: if used instead of `pages`, this is interpreted as a
+  space-separated list of absolute page names
+  ([[SubPage/LinkingRules]] are not taken into account)
+  to add to the trail
 
 * `sort`: add the pages matched by `pages` to the trail in this
   [[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`)