--- a/dovecot-example.conf	Sat Feb 05 20:07:26 2005 +0200
+++ b/dovecot-example.conf	Tue Feb 08 12:40:16 2005 +0200
@@ -453,8 +453,8 @@
   #  Courier version 0   : %f
   #  Courier version 1   : %u
   #  Courier version 2   : %v-%u
-  #  Cyrus (old)         : %u
-  #  Cyrus (new)         : %v.%u
+  #  Cyrus (<= 2.1.3)    : %u
+  #  Cyrus (>= 2.1.4)    : %v.%u
   #
   # Note that Outlook 2003 seems to have problems with %v.%u format which is
   # Dovecot's default, so if you're building a new server it would be a good
@@ -535,6 +535,18 @@
   #   plain digest-md5 cram-md5 apop anonymous
   mechanisms = plain
 
+  # Password database specifies only the passwords for users.
+  # http://wiki.dovecot.org/Authentication
+  #   passwd: /etc/passwd or similiar, using getpwnam()
+  #   shadow: /etc/shadow or similiar, using getspnam()
+  #   pam [<service> | *]: PAM authentication
+  #   checkpassword <path>: checkpassword executable authentication
+  #   passwd-file <path>: passwd-like file with specified location
+  #   vpopmail: vpopmail authentication
+  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+  #   sql <config path>: SQL database, see doc/dovecot-sql.conf
+  passdb = pam
+
   # User database specifies where mails are located and what user/group IDs
   # own them. For single-UID configuration use "static".
   # http://wiki.dovecot.org/Authentication
@@ -547,18 +559,6 @@
   #   sql <config path>: SQL database, see doc/dovecot-sql.conf
   userdb = passwd
 
-  # Password database specifies only the passwords for users.
-  # http://wiki.dovecot.org/Authentication
-  #   passwd: /etc/passwd or similiar, using getpwnam()
-  #   shadow: /etc/shadow or similiar, using getspnam()
-  #   pam [<service> | *]: PAM authentication
-  #   checkpassword <path>: checkpassword executable authentication
-  #   passwd-file <path>: passwd-like file with specified location
-  #   vpopmail: vpopmail authentication
-  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
-  #   sql <config path>: SQL database, see doc/dovecot-sql.conf
-  passdb = pam
-
   # User to use for the process. This user needs access to only user and
   # password databases, nothing else. Only shadow and pam authentication
   # requires roots, so use something else if possible. Note that passwd