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

diff --combined doc/plugins/contrib/po.mdwn
index 83fc6c57cafb6106d8722cf61ea4f685ca88d223,b22b8c179e1721149342d50d10bb11927f08a639..ad06e85703c3c6ae72f273cc0e555ce18b7fdbb9
--- 1/doc/plugins/contrib/po.mdwn
--- 2/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@@ -3,7 -3,7 +3,7 @@@ translated with gettext, using [po4a](h
  
  More information:
  
- * It can be found in my "po" branch on http://repo.or.cz/w/ikiwiki/intrigeri.git
+ * It can be found in [my "po" branch](http://repo.or.cz/w/ikiwiki/intrigeri.git?a=shortlog;h=refs/heads/po): `git clone git://repo.or.cz/ikiwiki/intrigeri.git`
  * It involves adding three hooks to ikiwiki core.
  * It is documented (including TODO and plans for next work steps) in `doc/plugins/po.mdwn`, which can be found in the same branch.
  * No public demo site is available so far, I'm working on this.
@@@ -14,17 -14,3 +14,17 @@@ The current version is a proof-of-conce
  but I'm prepared to hear various helpful remarks, and to rewrite parts of it as needed.
  
  Any thoughts on this?
 +
 +> Well, I think it's pretty stunning what you've done here. Seems very
 +> complete and well thought out. I have not read the code in great detail
 +> yet.
 +> 
 +> Just using po files is an approach I've never seen tried with a wiki. I
 +> suspect it will work better for some wikis than others. For wikis that
 +> just want translations that match the master language as closely as
 +> possible and don't wander off and diverge, it seems perfect. (But what happens
 +> if someone edits the Discussion page of a translated page?)
 +> 
 +> Please keep me posted, when you get closer to having all issues solved
 +> and ready for merging I can do a review and hopefully help with the
 +> security items you listed. --[[Joey]]