--- a/vmm.cfg	Sat Nov 05 19:04:07 2011 +0000
+++ b/vmm.cfg	Sat Nov 05 21:44:23 2011 +0000
@@ -68,6 +68,44 @@
 directory_mode = 504
 ; Force deletion of accounts and aliases when deleting a domain (Boolean)
 force_deletion = false
+;
+; The service settings will be evaluated and applied when a domain is
+; created. The service settings of the domain will be applied when you
+; create a new account.
+; Use the subcommand domainservices to modify a domain's service settings.
+; Or userservices in order to update the service setting of an account.
+; Allow smtp by default? (Boolean)
+smtp = true
+; Allow pop3 by default? (Boolean)
+pop3 = true
+; Allow imap by default? (Boolean)
+imap = true
+; Allow managesieve by default? (Boolean)
+sieve = true
+;
+; The quota_* settings will be evaluated and applied when a domain is
+; created. The domain's quota_* settings will be applied when an account
+; is added to a domain.
+; Use the subcommand domainquota to modify a domain's quota limits.
+; Or userquota in order to update an account's quota limits.
+; Quota limit in bytes. 0 means unlimited (String)
+; The value can have one of the suffixes:
+;    * b: bytes
+;    * k: kilobytes
+;    * M: megabytes
+;    * G: gigabytes
+; 1024 is the same as 1024b or 1k
+quota_bytes = 0
+; Quota limit in number of messages. 0 means unlimited (Int)
+quota_messages = 0
+;
+; The transport setting will be evaluated and applied when a domain is
+; created. The domain's transport setting will be applied when an account
+; is added to a domain.
+; Use the subcommand domaintransport to modify the transport of a domain.
+; Or usertransport in order to update an account's transport setting.
+; default transport for domains and accounts (String)
+transport = dovecot:
 
 #
 # Account settings
@@ -85,14 +123,6 @@
 random_password = false
 ; How many characters to include in the generated passwords? (Int)
 password_length = 8
-; Allow smtp by default? (Boolean)
-smtp = true
-; Allow pop3 by default? (Boolean)
-pop3 = true
-; Allow imap by default? (Boolean)
-imap = true
-; Allow managesieve by default? (Boolean)
-sieve = true
 
 #
 # external binaries
@@ -122,16 +152,4 @@
 dovecot_version = 1.2.11
 ; Password scheme to use (see also: dovecotpw -l) (String)
 password_scheme = CRAM-MD5
-; Quota limit in bytes. 0 means unlimited (String)
-; The value can have one of the suffixes:
-;    * b: bytes
-;    * k: kilobytes
-;    * M: megabytes
-;    * G: gigabytes
-; 1024 is the same as 1024b or 1k
-quota_bytes = 0
-; Quota limit in number of messages. 0 means unlimited (Int)
-quota_messages = 0
-; default transport for domains and accounts (String)
-transport = dovecot: