merged; notes

diff --git a/debian/changelog b/debian/changelog
index c27af5615fb59047a2c0d7e1ab09b3cb4684376a..0f6a7c810609032e8a35e16eb33db2c4b5951128 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100723) UNRELEASED; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
+  * po: The po_slave_languages setting is now a list, so the order of
+    translated languages can be controlled. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
 

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ddaba86f0abb16d39bf92085b0b34de66186ff04..d70247295254164d6fcdd536fa9ec780721587da 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.)
 >>>>> Implemented using the pipe separator, fixed the po.t test suite
 >>>>> accordingly. Please have a look. --[[intrigeri]]
 
+>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? 
+>>>>>> Also, the compatability code for HASH is not really needed,
+>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] 
+
 Pagespecs
 ---------