aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--doc/plugins/po.mdwn2
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 045f27540..d10bc36cf 100644
--- 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 3b152586e..fdef41e45 100644
--- 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
-------------