changelog

diff --combined IkiWiki/Plugin/inline.pm
index bdab5793b7c8a611ebb4bbfb7c1ff0951218712c,3dc410c276b62b85e2930b7eea4d63c0e66349da..687c8a48f3dfc16f9e933af1ae77a62ce4918344
--- 1/IkiWiki/Plugin/inline.pm
--- 2/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@@ -19,7 -19,7 +19,7 @@@ sub import 
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
        hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
-               call => \&IkiWiki::preprocess_inline);
+               call => \&IkiWiki::preprocess_inline, scan => 1);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
        hook(type => "format", id => "inline", call => \&format, first => 1);
@@@ -155,6 -155,23 +155,23 @@@ sub preprocess_inline (@) 
        if (! exists $params{pages} && ! exists $params{pagenames}) {
                error gettext("missing pages parameter");
        }
+ 
+       if (! defined wantarray) {
+               # Running in scan mode: only do the essentials
+ 
+               if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+                       # default to sorting age, the same as inline itself,
+                       # but let the params override that
+                       IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params);
+               }
+ 
+               return;
+       }
+ 
+       if (yesno($params{trail}) && IkiWiki::Plugin::trail->can("preprocess_trailitems")) {
+               scalar IkiWiki::Plugin::trail::preprocess_trailitems(sort => 'age', %params);
+       }
+ 
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss};
@@@ -677,6 -694,7 +694,6 @@@ sub genfeed ($$$$$@) 
                guid => $guid,
                feeddate => date_3339($lasttime),
                feedurl => $feedurl,
 -              version => $IkiWiki::version,
        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,

diff --combined debian/changelog
index d6b71eaa3f39cb95d826f6684b6601d6938006a0,c8db76966c97c4cd156d0227219b5b35c7f8f54b..3bc2a7e298435c2f51e285348474b2411841ebb2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,3 +1,25 @@@
 +ikiwiki (3.20120203) UNRELEASED; urgency=low
 +
 +  * Fix a snail mail address. Closes: #659158
 +  * openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549
 +  * Drop the version attribute on the generator tag in Atom feeds
 +    to make builds more reproducible. Closes: #661569 (Paul Wise)
 +  * shortcut: Support Wikipedia's form of url-encoding for unicode
 +    characters, which involves mojibake. Closes: #661198
 +  * osm: New plugin to embed an OpenStreetMap into a wiki page.
 +    Supports waypoints, tags, and can even draw paths matching
 +    wikilinks between pages containing waypoints.
 +    Thanks to Blars Blarson and Antoine Beaupré, as well as the worldwide
 +    OpenStreetMap community for this utter awesomeness.
 +  * Add a few missing jquery UI icons to attachment upload widget underlay.
 +  * URI escape filename when generating the diffurl.
++  * trail: New plugin to add navigation trails through pages via Next and
++    Previous links. Trails can easily be added to existing inlines by setting
++    trail=yes in the inline.
++    Thanks to Simon McVittie for his persistance developing this feature.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
 +
  ikiwiki (3.20120202) unstable; urgency=low
  
    * mdwn: Added nodiscount setting, which can be used to avoid using the