inline, trail: The pagenames parameter is now a list of absolute pagenames, not relat...

diff --git a/debian/changelog b/debian/changelog
index 97f5500f8b68a5bce8dc4d502c9fe223b8268088..5f94723657891be336af3560b7c7197d9a8ed1d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low
   * rename: Allow rename to be started not from the edit page; return to
     the renamed page in this case.
   * remove: Support removing of pages in the transient underlay. (smcv)
   * rename: Allow rename to be started not from the edit page; return to
     the renamed page in this case.
   * remove: Support removing of pages in the transient underlay. (smcv)

+  * inline, trail: The pagenames parameter is now a list of absolute
+    pagenames, not relative wikilink type names. This is necessary to fix
+    a bug, and makes pagenames more consistent with the pagespec used
+    in the pages parameter. (smcv)

 
  -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2012 14:33:14 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2012 14:33:14 -0400
 

diff --git a/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn b/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn
index 70b06a951b43656db77bdee103438e92d85ae397..486be0363d2a03f573f2e1e1878ab6c7aacfbdec 100644 (file)
--- a/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn
+++ b/doc/bugs/nonexistent_pages_in_inline_pagenames_do_not_add_a_dependency.mdwn
@@ -40,3 +40,5 @@ I think the presence dependency is probably the cleanest approach?
 >> semantics, my `ready/literal-pagenames` branch does that. For
 >> my main use-case for `pagenames` ([[plugins/contrib/album]])
 >> it's fine either way. --[[smcv]]
 >> semantics, my `ready/literal-pagenames` branch does that. For
 >> my main use-case for `pagenames` ([[plugins/contrib/album]])
 >> it's fine either way. --[[smcv]]

+
+>>> Ok, [[merged|done]]. I think it's more consistent this way. --[[Joey]]

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`)
 
 * `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`)
 
 * `sort`: add the pages matched by `pages` to the trail in this
   [[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`)