Merge branch 'master' into templatemove

diff --combined doc/todo/auto_rebuild_on_template_change.mdwn
index 6f560353bd713b6c3362ea7666e8558ae058c10d,037d0d1dbaff96148dac406f09edc136899992b7..192b22f70a43dd7c52babaa0027134d450b562a0
--- 1/doc/todo/auto_rebuild_on_template_change.mdwn
--- 2/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@@ -6,7 -6,7 +6,7 @@@ This would allow setting
  
        templatedir => "$srcdir/templates",
  
 -.. and then the [[wikitemplates]] are managed like other wiki files; and
 +.. and then the [[templates]] are managed like other wiki files; and
  like other wiki files, a change to them automatically updates dependent
  pages.
  
@@@ -62,3 -62,15 +62,15 @@@ Have started working on this
  >>>>>> it'd either be necessary to make them be internal pages
  >>>>>> (templates/inlinepage._tmpl) or special-case them in some other way.
  >>>>>> --[[smcv]]
+ 
+ >>>>>>> In my branch, I left in support for the templatedir, and also
+ >>>>>>> /usr/share/ikiwiki/templates. So, users do not have to put their
+ >>>>>>> custom templates in templates/ in the wiki. If they do, 
+ >>>>>>> the templates are copied to the destdir like other non-wiki page files
+ >>>>>>> are. The templates are not wiki pages, except those used by a few
+ >>>>>>> things like the [[plugins/template]] plugin.
+ >>>>>>> 
+ >>>>>>> That seems acceptable, since users probably don't need to modify
+ >>>>>>> many templates, so the clutter is small. (Especially when
+ >>>>>>> compared to the other clutter the basewiki always puts in destdir.)
+ >>>>>>> This could be revisted later. --[[Joey]]