remove add_templates option

Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ec8b32a639b5a7e319aa2615d29d00ead603b813..c2c2337b4a80fddc778feee9cf0cd990f5477210 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -157,13 +157,6 @@ sub getsetup () {
                safe => 0, # path
                rebuild => 1,
        },
-       templatedirs => {
-               type => "internal",
-               default => [],
-               description => "additional directories containing template files",
-               safe => 0,
-               rebuild => 0,
-       },
        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",
@@ -1661,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
        my $template=shift;
 
-       foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+       foreach my $dir ($config{templatedir},
                         "$installdir/share/ikiwiki/templates") {
                return "$dir/$template" if -e "$dir/$template";
        }

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 116fe7324e5d3b4a770acd6876067eb020cf4ae8..3ea19c63519bdecf6cd7331d21d722b3e0bc72de 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,6 @@ sub getsetup () {
                        safe => 0,
                        rebuild => 1,
                },
-               add_templates => {
-                       type => "string",
-                       example => ["$ENV{HOME}/.ikiwiki/templates"],
-                       description => "extra template directories to add",
-                       advanced => 1,
-                       safe => 0,
-                       rebuild => 1,
-               },
 }
 
 sub checkconfig () {
@@ -43,9 +35,6 @@ sub checkconfig () {
                        add_underlay($dir);
                }
        }
-       if ($config{add_templates}) {
-               push @{$config{templatedirs}}, @{$config{add_templates}};
-       }
 }
 
 1;

diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 8836a394c3e15b1dc757dff1d731669ecd9eb0f3..0cf819472238c6700ef2b1482fbea79170ffa22c 100644 (file)
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -12,9 +12,3 @@ revision control, like photos or software releases.
 Directories in `add_underlays` should usually be absolute. If relative,
 they're interpreted as relative to the parent directory of the basewiki
 underlay, which is probably not particularly useful in this context.
-
---
-
-This plugin also adds an `add_templates` option to the setup file.
-Its value is a list of template directories to look for template files in,
-if they are not present in the `templatedir`.