example-config: Moved shutdown_clients to main dovecot.conf.

--HG--
branch : HEAD

diff --git a/doc/example-config/conf.d/mail.conf b/doc/example-config/conf.d/mail.conf
index 45cebd8efc95e8056dc8a125427017998f7783b9..15f5e3518cfa3a3fb18e83b285b0e8319ea98831 100644 (file)
--- a/doc/example-config/conf.d/mail.conf
+++ b/doc/example-config/conf.d/mail.conf
@@ -187,12 +187,6 @@
 # the chroot directory, append "/." to mail_chroot. <doc/wiki/Chrooting.txt>
 #mail_chroot = 
 
-# Should all IMAP and POP3 processes be killed when Dovecot master process
-# shuts down. Setting this to "no" means that Dovecot can be upgraded without
-# forcing existing client connections to close (although that could also be
-# a problem if the upgrade is e.g. because of a security fix).
-#shutdown_clients = yes
-
 # UNIX socket path to master authentication server to find users.
 # This is used by imap (for shared users) and lda.
 #auth_socket_path = /var/run/dovecot/auth-userdb

diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf
index 4ec61e68c6779768b03c5ae03c9e3da2ad64272e..834b0307cba30035c19d4c3dd7aadb744ca3d767 100644 (file)
--- a/doc/example-config/dovecot.conf
+++ b/doc/example-config/dovecot.conf
@@ -51,6 +51,12 @@
 # (eg. shared mailboxes or if same uid is used for multiple accounts).
 #verbose_proctitle = no
 
+# Should all processes be killed when Dovecot master process shuts down.
+# Setting this to "no" means that Dovecot can be upgraded without
+# forcing existing client connections to close (although that could also be
+# a problem if the upgrade is e.g. because of a security fix).
+#shutdown_clients = yes
+
 ##
 ## Dictionary server settings
 ##