meta branch merge required

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index 158656a1343f51a6dd14269ba57e6a8aab8475ee..cccd53d0530b924f9ae54dbec3505e4063fe19f2 100644 (file)
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -14,3 +14,5 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title
 >> It was actually more complicated than expected. A working prototype is
 >> now in my `meta` branch, see my userpage for the up-to-date url.
 >> Thus tagging [[patch]]. --[[intrigeri]]
+>>
+>>> Joey, please consider merging my `meta` branch. --[[intrigeri]]

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index f90ffeed2014e43e78a940fce883d31fb0a5a75d..9919ac59536e3d44a13a2d0a585ed32c3f7da9c2 100644 (file)
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -139,6 +139,11 @@ Any thoughts on this?
 >>>>> to have the links text generation more customizable through
 >>>>> plugins, I could do both at the same time if we consider this
 >>>>> matter to be important enough. --[[intrigeri]]
+>>>>>
+>>>>>> The translation status in links is now implemented in my
+>>>>>> `po`branch. It requires my `meta` branch changes to
+>>>>>> work, though. I consider the latter to be mature enough to
+>>>>>> be merged. --[[intrigeri]]
 
 >> FWIW, I'm tracking your po branch in ikiwiki master git in the po
 >> branch. One thing I'd like to try in there is setting up a translated