both changes picked

diff --git a/debian/changelog b/debian/changelog
index 045f27540b32ad17680c85154e5e8fd0848e6bff..d10bc36cfdd2743f47084622f2652d5fabf9f5a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
   * Add Czech basewiki translation from Miroslav Kure.
+  * po: fix interdiction to create pages of type po (intrigeri)
+  * po: po: favor the type of linking page's masterpage on page creation
+    (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3b152586e57a8a453faee00ea6a41248d9ab6241..fdef41e454936b3b01a22ae649ed2a4c9c3197c4 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page
 creation (when `from=page.LL`). This is commit c9301d2c296f682.
 --[[intrigeri]]
 
+> Both cherry picked. --[[Joey]] 
+
 Documentation
 -------------