brought back checkcontent hook full-content compat.

[git.ikiwiki.info.git] / doc / plugins / po.mdwn

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index b5c5065cd48edb3adaf9bce327ca5737519e5672..75601289019774406d23be824e4a9bd488c2df82 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -265,8 +265,12 @@ Once the fix to
 generated links' text will be optionally based on the page titles set
 with the [[meta|plugins/meta]] plugin, and will thus be translatable.
 It will also allow displaying the translation status in links to slave
 generated links' text will be optionally based on the page titles set
 with the [[meta|plugins/meta]] plugin, and will thus be translatable.
 It will also allow displaying the translation status in links to slave

-pages. Both were implemented, and reverted in commit **FIXME**, which
-should be reverted once [[intrigeri]]'s `meta` branch is merged.
+pages. Both were implemented, and reverted in commit
+ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted
+once [[intrigeri]]'s `meta` branch is merged.
+
+An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
+and `meta` branches, and thus has thise additional features.

 
 Robustness tests
 ----------------
 
 Robustness tests
 ----------------