Merge commit 'upstream/master' into pub/master

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 1b1ca2ce22a8f2562a5977fda88cb7c41b2ea57f..7fe5a4dcf5c2f0543bef836067820133b2014405 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -201,7 +201,7 @@ sub preprocess_inline (@) { #{{{
                @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
        }
        else {
-               return sprintf(gettext("unknown sort type %s"), $params{sort});
+               error sprintf(gettext("unknown sort type %s"), $params{sort});
        }
 
        if (yesno($params{reverse})) {
@@ -298,7 +298,7 @@ sub preprocess_inline (@) { #{{{
                require HTML::Template;
                my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
                if (! @params) {
-                       return sprintf(gettext("nonexistant template %s"), $params{template});
+                       error sprintf(gettext("nonexistant template %s"), $params{template});
                }
                my $template=HTML::Template->new(@params) unless $raw;
        

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 98cc07178eb6789af0ed0c029a80982a025b2c3d..af215a493c20030b7a26d746d7d4f4a50d070068 100644 (file)
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -64,3 +64,19 @@ Any thoughts on this?
 >> probably decide that "slave" pages, being only translations, don't deserve
 >> a discussion page: the discussion should happen in the language in which the
 >> pages are written for real, which is the "master" one. --[[intrigeri]]
+>> 
+>> I think that's a good decision, you don't want to translate discussion,
+>> and if the discussion page turns out multilingual, well, se la vi. ;-)
+>> 
+>> Relatedly, what happens if a translated page has a broken link, and you
+>> click on it to edit it? Seems you'd first have to create a master page
+>> and could only then translate it, right? I wonder if this will be clear
+>> though to the user.
+>>
+>> And also, is there any way to start a translation of a page into a new
+>> lanauge using the web interface?
+>> 
+>> FWIW, I'm tracking your po branch in ikiwiki master git in the po
+>> branch. One thing I'd like to try in there is setting up a translated
+>> basewiki, which seems like it should be pretty easy to do, and would be
+>> a great demo! --[[Joey]]

diff --git a/doc/plugins/img/discussion.mdwn b/doc/plugins/img/discussion.mdwn
index 5bf340c561806ea23360b278c4ec10bde5f9956a..e1bb2d15b0b2fb1d313cd328813b54538be16500 100644 (file)
--- a/doc/plugins/img/discussion.mdwn
+++ b/doc/plugins/img/discussion.mdwn
@@ -7,3 +7,6 @@ instead of linking to the PNG image file.  --[[tschwinge]]
 > Done, use link=somepage --[[Joey]]
 
 It would be handy if the `class` and `id` tags were passed through to the surrounding `table` in the case of `caption` being present.  Would this break anything?  --[[neale]]
+
+> Seems unlikely to break *too* much. I can imagine css that styles the img
+> unexpectedly applying the table. --[[Joey]]

diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
index 32f8c798bb92452796db61a68d871320cc8fb134..3ada0864b0c855a7f9774b8f9929b0c8801d1d6c 100644 (file)
--- a/doc/plugins/relativedate.mdwn
+++ b/doc/plugins/relativedate.mdwn
@@ -13,4 +13,4 @@ If this plugin is enabled, you may also add relative dates to pages in the
 wiki, by using html elements in the "relativedate" class. For example, this
 will display as a relative date:
 
-       <span class="relativedate">Fri Oct 17 18:36:13 EDT 2008</span>
+       <span class="relativedate">Tue Jan 20 12:00:00 EDT 2009</span>