Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
	doc/plugins/contrib/po.mdwn

diff --cc doc/plugins/contrib/po.mdwn
index 3f5a65c05c066a7fce694c79bf649f33bcfec81e,5f0de3b5e96d579bc0a7b8a9fb11b5aa34d0327d..618e1659826f0a1d29eef3e8ca08a8080ab5ba73
--- 1/doc/plugins/contrib/po.mdwn
--- 2/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@@ -359,17 -358,6 +359,17 @@@ daring a timid "please pull"... or rath
  >>   disabled, I fear the ones who could do this would maybe think
  >>   it's blandly impossible and give up.
  >> 
- > 
++ 
 +> * What's the reasoning behind checking that the link plugin
 +>   is enabled? AFAICS, the same code in the scan hook should
 +>   also work when other link plugins like camelcase are used.
 +> * In `pagetemplate` there is a comment that claims the code
 +>   relies on `genpage`, but I don't see how it does; it seems
 +>   to always add a discussion link?
 +> * Is there any real reason not to allow removing a translation?
 +>   I'm imagining a spammy translation, which an admin might not
 +>   be able to fix, but could remove.
 +>  
  > --[[Joey]] 
  >> 
  >> --[[intrigeri]]