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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 9ed4a1adb8352f5bb91eb25a424d9cc5f1e1e212..4f8d5036e198b4c0eac2f290156c411907190b87 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -38,7 +38,8 @@ memoize("percenttranslated");
 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);
-       hook(type => "checkconfig", id => "po", call => \&checkconfig);
+       hook(type => "checkconfig", id => "po", call => \&checkconfig,
+               last => 1);
        hook(type => "needsbuild", id => "po", call => \&needsbuild);
        hook(type => "scan", id => "po", call => \&scan, last => 1);
        hook(type => "filter", id => "po", call => \&filter);

diff --git a/doc/bugs/default__95__pageext_not_working.mdwn b/doc/bugs/default__95__pageext_not_working.mdwn
index c34491cf57dbd8c3cccb2f057a54769de6f221a9..b7064206f9d0af4061b77ebcfa11c32bf24cab96 100644 (file)
--- a/doc/bugs/default__95__pageext_not_working.mdwn
+++ b/doc/bugs/default__95__pageext_not_working.mdwn
@@ -5,3 +5,12 @@ I tried to set it as 'txt' and as a custom plugin I am developing but when I edi
 Yes I am only trying to set it to loaded and working plugins. 
 
 ikiwiki version 3.20101129
+
+> I've tested `default_pageext` with 3.20110124, and it works fine.
+> 
+> It seems to me from what you describe that you expect
+> it to have an effect when you go and edit an existing page.
+> That's not what it's for, it only chooses the default used 
+> when creating a new page. 
+> 
+> Closing this bug as apparent user error. --[[Joey]] [[done]]

diff --git a/doc/bugs/po:_might_not_add_translated_versions_of_all_underlays.mdwn b/doc/bugs/po:_might_not_add_translated_versions_of_all_underlays.mdwn
index 66d16bf234b656f0bde0b6ada8c2d1da61d13a72..82aed400d83608e2c86f3f8691b8dc3b179ea3c3 100644 (file)
--- a/doc/bugs/po:_might_not_add_translated_versions_of_all_underlays.mdwn
+++ b/doc/bugs/po:_might_not_add_translated_versions_of_all_underlays.mdwn
@@ -6,5 +6,11 @@ of underlays added by a plugin that comes after it in `$config{add_plugins}`;
 for instance, if you have `add_plugins => qw(po smiley)`, you'll probably
 not get the translated versions of `smileys.mdwn`. (I haven't tested this.)
 
+> It doesn't happen because smiley adds the underlay unconditionally on 
+> import. Which is really more usual.
+
 To see them all, `po` should use `last => 1` when registering the hook.
 --[[smcv]]
+
+> At least all that don't last their hooks too! But, added, since
+> it will make the problem much less likely to occur. --[[Joey]] [[done]]

diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn
index ef827fb3f18f831ec49cf189f4b663370e164a08..ef7fcb12c024f1c280e6220ec1555079e86300bc 100644 (file)
--- a/doc/todo/inline_raw_files.mdwn
+++ b/doc/todo/inline_raw_files.mdwn
@@ -83,4 +83,8 @@ unwise.
 I didn't look much further, because it seems to me what you're trying to do
 can be better accomplished by using the highlight plugin. Assuming the raw
 file you want to inline and comment on is some source-code-like thing,
-which seems likely. --[[Joey]] [[!tag reviewed]]
+which seems likely.
+
+Or, another way to do it would be to use the templates plugin, and make
+a template there that puts an inline directive inside pre tags.
+ --[[Joey]] [[!tag reviewed]]