Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / online_configuration.mdwn

diff --git a/doc/todo/online_configuration.mdwn b/doc/todo/online_configuration.mdwn
index 3e18bbf4337dac26228a3e870488d261bd9591cd..02a8c6e5fac5985ab2526670b59111304b4684f2 100644 (file)
--- a/doc/todo/online_configuration.mdwn
+++ b/doc/todo/online_configuration.mdwn
@@ -18,11 +18,11 @@ The plugin could have these config options:
        websetup_exclude => [qw{option_baz}],
        # list of plugins that cannot be enabled/disabled via the web
        # interface
-       websetup_unconfigurable_plugins => [qw{git svn bzr mercurial monotone tla}]
+       websetup_force_plugins => [qw{git svn bzr mercurial monotone tla}]
 
 Leaning toward just making it write out to the same setup file, rather than
 writing to a subsidiary setup file. However, this would mean that any
 comments in the file would be lost, and that it couldn't be used if the
 setup file had weird stuff (perl code, etc).
 
-[[!tag wishlist]]
+[[!tag wishlist done]]