Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/plugins/osm.mdwn b/doc/plugins/osm.mdwn
index e41744eb4dd035ec1f736a019f98475455543a7d..040d175ca21843de5bcff4e0cd9136a7596c24af 100644 (file)
--- a/doc/plugins/osm.mdwn
+++ b/doc/plugins/osm.mdwn
@@ -13,6 +13,8 @@ You will need the [[!cpan XML::Writer]] perl module to write KML files,
 which is the default mode of operation. GeoJSON files can also be generated
 if the [[!cpan JSON]] perl module is installed.
 
+This provides the [[ikiwiki/directive/waypoint]] and [[ikiwiki/directive/osm]] directives.
+
 ---
 
 The plugin was originally written by

diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
index ed9dd85fd4e2c44f438c3f589f851ac39a1fe274..7e95791c6467127c8095d4da89f50ad6fbd3e03d 100644 (file)
--- a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
+++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
@@ -13,7 +13,7 @@ It would rock if I could view diffs from the web without going via feeds. I envi
 > > 
 > > 1. it assumes the toggle.js code is loaded somehow
 > > 2. if the toggle code isn't loaded the diffs are displayed (which is arguably better than showing nothing since we ship the diff to the UA anyways...)
-> > 3. it will show only if there's a revert URL, which is backwards, but otherwise the display is weird, with each button on its own line
+> > 3. <del>it will show only if there's a revert URL, which is backwards, but otherwise the display is weird, with each button on its own line</del> fixed!
 > > 4. if the diffurl parameter is set in the template, we'd actually see two sets of glasses, which is silly. 
 > >
 > > I feel this should nevertheless be implemented because if we're going to compile all this crap in the page anyways and send it to the client, why not allow the user to show it? I also feel that showing it by default is a lesser evil for non-javascript users.