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

3 files changed, 58 insertions, 2 deletions

diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
new file mode 100644
index 000000000..c9756617d
--- /dev/null
+++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn
@@ -0,0 +1,38 @@
+Adding text of the format 
+
+    Apple
+    :   Pomaceous fruit of plants of the genus Malus in 
+        the family Rosaceae.
+    :   An american computer company.
+
+    Orange
+    :   The fruit of an evergreen tree of the genus Citrus.
+
+Does not result in expected HTML as described in the [MultiMarkdown Syntax Guide](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/):
+
+Should be 
+
+    <dl xmlns="http://www.w3.org/1999/xhtml">
+    <dt>Apple</dt>
+     <dd>
+       <p>Pomaceous fruit of plants of the genus Malus in 
+          the family Rosaceae.</p>
+     </dd>
+     <dd>
+       <p>An american computer company.</p>
+    </dd>
+    <dt>Orange</dt>
+     <dd>
+      <p>The fruit of an evergreen tree of the genus Citrus.</p>
+     </dd>
+    </dl>
+
+But instead it gives:
+
+    <p>Apple
+     :   Pomaceous fruit of plants of the genus Malus in 
+         the family Rosaceae.
+     :   An american computer company.</p>
+
+    <p>Orange
+    :   The fruit of an evergreen tree of the genus Citrus.</p>
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index dca2f5d66..079a36633 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -260,7 +260,9 @@ If a page contains a WikiLink to itself, ikiwiki does not normally
 turn that into a hyperlink. However, if a translated page contains a
 WikiLink to itself, a hyperlink is inserted, at least with the default
 `po_link_to` the link points to the English version of the page. Is there a
-good reason for that to be done? --[[Joey]] 
+good reason for that to be done? --[[Joey]]
+
+> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]]
 
 Language display order
 ----------------------
@@ -280,12 +282,23 @@ That used to be so, but the bug was fixed. Does this mean
 that po might be replacing the only link on a page, in error? 
 --[[Joey]] 
 
+> It would replace it. The only problematic case is when another
+> plugin has its own reasons, in its `scan` hook, to add a page
+> that is already there to `$links{$page}`. This other plugin's
+> effect might then be changed by po's `scan` hook... which could
+> be either good (better overall l10n) or bad (break the other
+> plugin's goal). --[[intrigeri]]
+
 Name of toplevel index page
 ---------------------------
 
 Normally at the top index page of a wiki, you see the wiki name at
 the top. However, at the top *translated* index page, you see something
-like "index.da". --[[Joey]] 
+like "index.da". --[[Joey]]
+
+> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'`
+> test with a predicate call such as isindexpage($page). Such a predicate
+> function could then be overriden by the po plugin. --[[intrigeri]]
 
 Pagespecs
 ---------
@@ -322,6 +335,10 @@ When a po file is changed, the recentchanges page shows a link such as
 language) version of the page. It would be better in this one case if
 the link went direct to the translated version of the page. --[[Joey]] 
 
+> The (untested) commit 496e8523c670 in my po branch might fix this...
+> or at least, I believe, put someone on the right track.
+> --[[intrigeri]]
+
 Double commits of po files
 --------------------------
 
diff --git a/doc/todo/tmplvars_plugin/discussion.mdwn b/doc/todo/tmplvars_plugin/discussion.mdwn
new file mode 100644
index 000000000..93cb9b414
--- /dev/null
+++ b/doc/todo/tmplvars_plugin/discussion.mdwn
@@ -0,0 +1 @@
+I find this plugin quite usefull. But one thing, I would like to be able to do is set a tmplvar e.g. in a sidebar so that it affects all Pages this sidebar is used in. --martin