none

diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn
index 3660996..5d70f50 100644 (file)
--- a/TWiki/TWikiPreferences.mdwn
+++ b/TWiki/TWikiPreferences.mdwn
@@ -50,6 +50,12 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
 - Mail host for outgoing mail. This is used for [[TWikiNotificationOfChanges]] if Perl module <code>**Net::SMTP**</code> is installed. If not, sendmail is used instead (defined by <code>**$mailProgram**</code> in <code>**TWiki.cfg**</code>). Examples: `mail.your.company` or `localhost`
   - Set SMTPMAILHOST = mail
 
+- [[TWikiPlugins]] configuration: All plugin modules that exist in the `lib/TWiki/Plugins` directory are activated automatically unless disabled by DISABLEDPLUGINS. You can optionally list the installed plugins in INSTALLEDPLUGINS. This is useful to define the sequence of plugin execution, or to specify other webs then the TWiki web for the plugin topics. Specify plugins as a comma separated list of topics.
+  - Set INSTALLEDPLUGINS = [[DefaultPlugin]]
+  - Set DISABLEDPLUGINS = [[EmptyPlugin]]
+  - Currently activated plugins: [[SpreadSheetPlugin]], [[CommentPlugin]], [[EditTablePlugin]], [[InterwikiPlugin]], [[PreferencesPlugin]], [[SlideShowPlugin]], [[SmiliesPlugin]], [[TablePlugin]], [[TwistyPlugin]]
+  - **_Note:_** In case you have a rough plugin you can disable all plugins with the <code>**$disableAllPlugins**</code> flag in the `TWiki.cfg` file.
+
 - http-equiv meta tags for **_view_**, **_rdiff_**, **_attach_**, **_search\*_** scripts:
 
           * Set HTTP_EQUIV_ON_VIEW =
@@ -68,16 +74,6 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
 - Site-level preferences that are **not** allowed to be overridden by [[WebPreferences]] and user preferences:
   - Set FINALPREFERENCES = PREVIEWBGIMAGE, WIKIWEBMASTER, MAILHOST
 
-**_Plugin Preferences:_**
-
-- Installed [[TWikiPlugins]]: To enable/disable plugins, move them between ACTIVEPLUGINS and INACTIVEPLUGINS. Specify a comma separated list of plugin topics; the name of the web **_must_** be specified (i.e. <code>**TWiki.DefaultPlugin, TWiki.AnOtherPlugin**</code>)
-  - Set ACTIVEPLUGINS = [[DefaultPlugin]]
-  - Set INACTIVEPLUGINS = [[EmptyPlugin]]
-
-- Preferences of [[DefaultPlugin]]:
-  - Allow depreciated `%INCLUDE:"topic"%` syntax: (`0` or `1`)
-    - Set DEFAULTPLUGIN\_OLDINCLUDE = 1
-
 **_Notes:_**
 
 - A preference is defined as: <br />`6 spaces * Set NAME = value`<br /> Example: