From: Timo Sirainen <tss@iki.fi>
Date: Fri, 19 Mar 2010 18:43:20 +0000 (+0200)
Subject: example-config: Added global mail_plugins, set per-protocol mail_plugins=$mail_plugins.
X-Git-Tag: 2.0.beta4~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a682610faf9847ad5404ad9674fc19ef2316a833;p=thirdparty%2Fdovecot%2Fcore.git

example-config: Added global mail_plugins, set per-protocol mail_plugins=$mail_plugins.

--HG--
branch : HEAD
---

diff --git a/doc/example-config/conf.d/imap.conf b/doc/example-config/conf.d/imap.conf
index 9a27930554..097d4e1cde 100644
--- a/doc/example-config/conf.d/imap.conf
+++ b/doc/example-config/conf.d/imap.conf
@@ -12,8 +12,8 @@ protocol imap {
   # NOTE: The username is compared case-sensitively.
   #mail_max_userip_connections = 10
 
-  # Space separated list of plugins to load.
-  #mail_plugins = 
+  # Space separated list of plugins to load (default is global mail_plugins).
+  #mail_plugins = $mail_plugins
 
   # IMAP logout format string:
   #  %i - total number of bytes read from client
diff --git a/doc/example-config/conf.d/lda.conf b/doc/example-config/conf.d/lda.conf
index acc6613718..a59d0ec018 100644
--- a/doc/example-config/conf.d/lda.conf
+++ b/doc/example-config/conf.d/lda.conf
@@ -35,6 +35,6 @@
 #lda_mailbox_autosubscribe = no
 
 protocol lda {
-  # Space separated list of plugins to load.
-  #mail_plugins = 
+  # Space separated list of plugins to load (default is global mail_plugins).
+  #mail_plugins = $mail_plugins
 }
diff --git a/doc/example-config/conf.d/lmtp.conf b/doc/example-config/conf.d/lmtp.conf
index a56ea109f3..69d17b5aca 100644
--- a/doc/example-config/conf.d/lmtp.conf
+++ b/doc/example-config/conf.d/lmtp.conf
@@ -6,6 +6,6 @@
 #lmtp_proxy = no
 
 protocol lmtp {
-  # Space separated list of plugins to load.
-  #mail_plugins = 
+  # Space separated list of plugins to load (default is global mail_plugins).
+  #mail_plugins = $mail_plugins
 }
diff --git a/doc/example-config/conf.d/mail.conf b/doc/example-config/conf.d/mail.conf
index 1a22b87bda..96d1128685 100644
--- a/doc/example-config/conf.d/mail.conf
+++ b/doc/example-config/conf.d/mail.conf
@@ -198,6 +198,9 @@
 # Directory where to look up mail plugins.
 #mail_plugin_dir = /usr/lib/dovecot
 
+# Space separated list of plugins to load.
+#mail_plugins = 
+
 ##
 ## Mailbox handling optimizations
 ##
diff --git a/doc/example-config/conf.d/pop3.conf b/doc/example-config/conf.d/pop3.conf
index a3d6816f0f..0bc44af212 100644
--- a/doc/example-config/conf.d/pop3.conf
+++ b/doc/example-config/conf.d/pop3.conf
@@ -63,8 +63,8 @@ protocol pop3 {
   # NOTE: The username is compared case-sensitively.
   #mail_max_userip_connections = 3
 
-  # Space separated list of plugins to load.
-  #mail_plugins = 
+  # Space separated list of plugins to load (default is global mail_plugins).
+  #mail_plugins = $mail_plugins
 
   # Workarounds for various client bugs:
   #   outlook-no-nuls: