Merge branch 'master' into templatemove

Conflicts:
	doc/templates.mdwn

diff --combined Makefile.PL
index 09ec2e730d3a3f1e5f731da700e91ac290bda5a5,b079886ac079a24afe279eb7cd1007fe9a872af8..4001c841b8f79c9a98870f526f2553db615602ca
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -35,8 -35,8 +35,8 @@@ scripts=ikiwiki-update-wikilist ikiwiki
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
        chmod +x $@
  
- ikiwiki.setup: ikiwiki.out
-       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+ ikiwiki.setup:
+       HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
  
  extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@@ -49,18 -49,14 +49,18 @@@
        sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
        rm -f ikiwiki.spec.bkp
        
- docwiki: ikiwiki.out
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+ docwiki:
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
  
  extra_clean:
-       $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
+       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
        rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
        $(MAKE) -C po clean
  
 +# Joey uses this before committing.
 +myclean: clean
 +      git checkout po ikiwiki.spec
 +
  underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \

diff --combined doc/todo/auto_rebuild_on_template_change.mdwn
index 838d15c1a7ca60572551ba692cd366ec7092c654,66aa071934e539b77c6963d22c9593af9b17806b..6f560353bd713b6c3362ea7666e8558ae058c10d
--- 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.
  
@@@ -39,6 -39,9 +39,9 @@@ Note also that when using templates fro
  needs to be set. Currently this is done by the two plugins that use
  such templates, while includes are allowed in `templatedir`.
  
+ Have started working on this.
+ [[!template id=gitbranch branch=origin/templatemove author="[[Joey]]"]]
+ 
  > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
  
  >> It would be better for them not to be rendered separately at all.