update

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad41215c1e31dd2964312a6f6a48d2aa6508920e..6a6e93e7ec699e250ae72b408dee21b21e39b4d9 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -115,7 +115,7 @@ sub getsetup () { #{{{
                                openid signinedit lockedit conditional
                                recentchanges parentlinks}],
                description => "plugins to enable by default",
-               safe => 1,
+               safe => 0,
                rebuild => 1,
        },
        add_plugins => {

diff --git a/debian/changelog b/debian/changelog
index c4e4b7f48a34b1bbac5c92b6ed1090662ef37421..4954c77377ce6489387fad28dc230e5189d2195d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ikiwiki (2.60) UNRELEASED; urgency=low
  
   * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
-    can be used set up a new wiki in seconds.
+    can be used create a new wiki in seconds.
   * Add getsetup hook, all plugins that add fields to %config should use it.
   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
     current configuration.

diff --git a/doc/todo/online_configuration.mdwn b/doc/todo/online_configuration.mdwn
index 2393b75afd34e5bd763be6e090106e49dc5b707f..584eb1dd21205fc698a172aefe659b8175025e7a 100644 (file)
--- a/doc/todo/online_configuration.mdwn
+++ b/doc/todo/online_configuration.mdwn
@@ -22,6 +22,9 @@ The plugin could have these config options:
        websetup_include => [qw{safe}],
        # list of options to exclude from web setup
        websetup_exclude => [qw{option_baz}],
+       # list of plugins that cannot be enabled/disabled via the web
+       # interface
+       websetup_unconfigurable_plugins => [qw{}]
 
 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