Merge commit 'schmonz/master' into cvs

[git.ikiwiki.info.git] / doc / plugins / contrib / trail.mdwn

diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn
index eb233e095f8262bae9207e2d1c6cfe258d1c6f68..337e5d427d34ef932a15cebc9652ff6a8aeb60bd 100644 (file)
--- a/doc/plugins/contrib/trail.mdwn
+++ b/doc/plugins/contrib/trail.mdwn
@@ -9,10 +9,6 @@ and are likely to include it in ikiwiki, I'll try to modify
 [[plugins/contrib/album]] to be based on it, rather than partially
 reinventing it.
 
 [[plugins/contrib/album]] to be based on it, rather than partially
 reinventing it.
 

-This plugin can benefit from
-[[another_of_my_branches|todo/inline_plugin:_specifying_ordered_page_names]]
-but does not require it.
-

 Bugs:
 
 * \[[!inline pages="..." trail=yes]] currently tries to work out
 Bugs:
 
 * \[[!inline pages="..." trail=yes]] currently tries to work out


@@ -20,9 +16,7 @@ Bugs:
   won't work, because matching a pagespec at scan time is
   unreliable - pages we want might not have been scanned yet! I
   haven't worked out a solution for this. I think
   won't work, because matching a pagespec at scan time is
   unreliable - pages we want might not have been scanned yet! I
   haven't worked out a solution for this. I think

-  \[[!inline pagenames="..." trail=yes]]
-  ([[patch_required|todo/inline_plugin:_specifying_ordered_page_names]])
-  would be safe, though.
+  \[[!inline pagenames="..." trail=yes]] would be safe, though.

 
 ----
 
 
 ----