--- a/dovecot-example.conf	Mon Oct 16 14:12:40 2006 +0300
+++ b/dovecot-example.conf	Tue Oct 17 13:55:56 2006 +0300
@@ -179,9 +179,16 @@
 ## Mailbox locations and namespaces
 ##
 
-# Default MAIL environment to use when it's not set. By leaving this empty
-# dovecot tries to do some automatic detection as described in
-# doc/mail-storages.txt. There are a few special variables you can use, eg.:
+# Location for users' mailboxes. This is the same as the old default_mail_env
+# setting. The default is empty, which means that Dovecot tries to find the
+# mailboxes automatically. This won't work if the user doesn't have any mail
+# yet, so you should explicitly tell Dovecot the full location.
+#
+# If you're using mbox, giving a path to INBOX file (eg. /var/mail/%u) isn't
+# enough. You'll also need to tell Dovecot where the other mailboxes are and
+# where Dovecot can place its index files.
+#
+# There are a few special variables you can use, eg.:
 #
 #   %u - username
 #   %n - user part in user@domain, same as %u if there's no domain
@@ -190,11 +197,13 @@
 #
 # See doc/variables.txt for full list. Some examples:
 #
-#   default_mail_env = maildir:/var/mail/%1u/%u/Maildir
-#   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
-#   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
+#   mail_location = maildir:/var/mail/%1u/%u/Maildir
+#   mail_location = mbox:~/mail/:INBOX=/var/mail/%u
+#   mail_location = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
 #
-#default_mail_env = 
+# http://wiki.dovecot.org/MailLocation
+#
+#mail_location = 
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections:
@@ -206,7 +215,7 @@
 # accessible mailboxes.
 #
 # REMEMBER: If you add any namespaces, the default namespace must be added
-# explicitly, ie. default_mail_env does nothing unless you have a namespace
+# explicitly, ie. mail_location does nothing unless you have a namespace
 # without a location setting. Default namespace is simply done by having a
 # namespace with empty prefix.
 #namespace private {
@@ -220,7 +229,7 @@
    #prefix = 
 
    # Physical location of the mailbox. This is in same format as
-   # default_mail_env, which is also the default for it.
+   # mail_location, which is also the default for it.
    #location =
 
    # There can be only one INBOX, and this setting defines which namespace
@@ -999,7 +1008,7 @@
   #acl = vfile:/etc/dovecot-acls
 
   # Convert plugin. If set, specifies the source storage path which is
-  # converted to destination storage (default_mail_env).
+  # converted to destination storage (mail_location).
   #convert_mail = mbox:%h/mail
 
   # Trash plugin. When saving a message would make user go over quota, this