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

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 53327c1dae94ef5896119cc874133a9a3c1a9b4e..fc7d1d50277b90726f2863e20d99cdd79bb63560 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -301,6 +301,9 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>> no way to really sanely represent complex data structures in web
 >>>> setup. --[[Joey]]
 
+>>>>> Implemented using the pipe separator, fixed the po.t test suite
+>>>>> accordingly. Please have a look. --[[intrigeri]]
+
 Pagespecs
 ---------
 
@@ -351,7 +354,7 @@ and then committed again. The second commit makes this change:
 Same thing happens when a change to an existing page triggers a po file
 update. --[[Joey]] 
 
-> * The s/utf-8/UTF-8 part is fixed in my po branch.
+> * The s/utf-8/UTF-8 part has been fixed.
 > * The ENCODING\n part is due to an inconsistency in po4a, which
 >   I've just send a patch for. --[[intrigeri]]