From: Joey Hess Date: Fri, 23 Apr 2010 20:48:53 +0000 (-0400) Subject: Merge branch 'master' into templatemove X-Git-Tag: 3.20100427~37 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e8a23c299e0ec548110283516b8413cdaff8737e?ds=inline;hp=-c Merge branch 'master' into templatemove --- e8a23c299e0ec548110283516b8413cdaff8737e diff --combined doc/todo/auto_rebuild_on_template_change.mdwn index 6f560353b,037d0d1db..192b22f70 --- a/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]]