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

diff --git a/doc/bugs/po:_double_commits_of_po_files.mdwn b/doc/bugs/po:_double_commits_of_po_files.mdwn
index a871785be3af43e7fb5051b3eca6c1170f72d513..2f3015e2b053d1bd86040ab18edca9a171e6fb33 100644 (file)
--- a/doc/bugs/po:_double_commits_of_po_files.mdwn
+++ b/doc/bugs/po:_double_commits_of_po_files.mdwn
@@ -17,3 +17,6 @@ update. --[[Joey]]
 >> their mailing-list:
 >> [post archive](http://lists.alioth.debian.org/pipermail/po4a-devel/2010-July/001897.html).
 >> --[[intrigeri]]
+
+>>> Seems to me Debian Squeeze's po4a does not expose this bug anymore
+>>> => [[done]]. --[[intrigeri]]

diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn
index 10715001c19fbe6365948e6daebffc16bba9a734..98da7fd24cf4f39966656ba57400f2430132761e 100644 (file)
--- a/doc/bugs/po:_markdown_link_parse_bug.mdwn
+++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn
@@ -12,3 +12,8 @@ file:
        "\"Ikiwiki hosting\") when I signed up."
 
 --[[Joey]] 
+
+> I cannot reproduce this on my Squeeze system with ikiwiki Git code;
+> both the page in the master language and translation pages perfectly
+> display the link (and tooltip) in my testing environment. Were you
+> using an oldest po4a, such as Lenny's one? --[[intrigeri]]

diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
index 8238f50dfdf9f722f43fc9209aad94d35c0999e1..33b8982bad1c8d570d90e8501a41dccf5ca339e8 100644 (file)
--- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn
+++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
@@ -20,3 +20,9 @@ When i click on "templates.fr", i get the po.file instead of html.
        },  
        # slave languages (PO files)  
        po_slave_languages => [qw{fr|Français}],  
+
+>>> I've never found any `.po` file in the destination directory on
+>>> any of my PO-enabled ikiwiki instances. Without more information,
+>>> there's nothing I can do: the config snippet pasted above is more
+>>> or less the example one and does not allow me to reproduce the
+>>> bug. --[[intrigeri]]

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index c164cf54aa9bbea7f8181bc0f26a2239e8bdc9c4..baad063ef53d78c48bd6f184cae6ffa49e8a62bc 100644 (file)
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -77,9 +77,20 @@ and decided this time it was really needed to implement this feature.
 >>>>> rewrite warning) mirrorlist branch. Please review, please pull.
 >>>>> --[[intrigeri]]
 
+>>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and
+>>>>>> checked it still works properly. --[[intrigeri]]
+
 >>>>> concerning goto/cgiurl, what about having that as the default in
 >>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and
 >>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases?
 >>>>> that would keep typical installation with a clutter-less configuration,
 >>>>> and support more individual setups too.
 >>>>> --[[chrysn]]
+
+>>>>>> I would not mind. On the other hand Joey was concerned about
+>>>>>> cluttering the code to support edge cases, which I fully
+>>>>>> understand. The case you (chrysn) are describing being even
+>>>>>> more specific than the one I was initially talking of, I think
+>>>>>> this should not block the merge of the branch I have been
+>>>>>> proposing. Support for the usecase you are suggesting can
+>>>>>> always be added later if needed. --[[intrigeri]]