# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1392679141 0
# Node ID 8167ba72235c5f4fcce09a928bbbb38ee1bac57d
# Parent  77561c118f422da20aadc49d0b68eebd95ccc593# Parent  8c7eeb2bc13938bf542540abfeb2bd9771cfb40f
merged changes from default(8c7eeb2bc139).

diff -r 77561c118f42 -r 8167ba72235c Configure.Dovecot_2
--- a/Configure.Dovecot_2	Sun Feb 16 23:07:30 2014 +0000
+++ b/Configure.Dovecot_2	Mon Feb 17 23:19:01 2014 +0000
@@ -25,6 +25,9 @@
 ###
 # conf.d/10-auth.conf
 ###
+# When you set another misc.password_scheme than PLAIN or CRAM-MD5 in
+# your vmm.cfg, you have to remove cram-md5 from the auth_mechanisms
+# setting.
 auth_mechanisms = plain login cram-md5
 passdb {
   driver = sql
diff -r 77561c118f42 -r 8167ba72235c VirtualMailManager/config.py
diff -r 77561c118f42 -r 8167ba72235c doc/web/source/_static/vmm.cfg
diff -r 77561c118f42 -r 8167ba72235c man/man5/vmm.cfg.5
--- a/man/man5/vmm.cfg.5	Sun Feb 16 23:07:30 2014 +0000
+++ b/man/man5/vmm.cfg.5	Mon Feb 17 23:19:01 2014 +0000
@@ -1,4 +1,4 @@
-.TH "VMM.CFG" "5" "2014-02-11" "vmm 0.7" "vmm"
+.TH "VMM.CFG" "5" "2014-02-17" "vmm 0.7" "vmm"
 .SH NAME
 vmm.cfg \- configuration file for vmm
 .\" -----------------------------------------------------------------------
@@ -509,6 +509,15 @@
 Supported encoding suffixes are:
 .BR .b64 ", " .base64 " and " .hex .
 For example: PLAIN.BASE64
+.IP Note:
+When setting another password scheme than
+.BR PLAIN " or " CRAM\-MD5 ,
+you have to remove
+.B cram\-md5
+from the
+.I auth_mechanisms
+setting in your
+.IR dovecot/conf.d/10\-auth.conf .
 .\" -----------------------------------------------------------------------
 .SH EXAMPLE
 An example configuration.
diff -r 77561c118f42 -r 8167ba72235c vmm.cfg
--- a/vmm.cfg	Sun Feb 16 23:07:30 2014 +0000
+++ b/vmm.cfg	Mon Feb 17 23:19:01 2014 +0000
@@ -148,6 +148,9 @@
 ; the version number from `dovecot --version` (String)
 ; e.g. 1.2.17, 2.0.21, 2.1.9 or 2.2.beta1
 dovecot_version = 2.1.9
+; NOTE: When using other password schemes than PLAIN or CRAM-MD5, you
+;	have to remove `cram-md5' from the auth_mechanisms setting in
+;	dovecot/conf.d/10-auth.conf.
 ; Password scheme to use (see also: ´vmm listpwschemes`) (String)
 password_scheme = CRAM-MD5