--- a/doc/dovecot-ldap.conf	Sun Nov 05 18:12:14 2006 +0200
+++ b/doc/dovecot-ldap.conf	Sun Nov 05 18:38:59 2006 +0200
@@ -1,5 +1,7 @@
-# NOTE: If you're not using authentication binds (which is default), you'll
-# have to give dovecot-auth read access to userPassword field in LDAP server
+# This file is opened as root, so it should be owned by root and mode 0600.
+#
+# NOTE: If you're not using authentication binds, you'll need to give
+# dovecot-auth read access to userPassword field in the LDAP server.
 # With OpenLDAP this is done by modifying /etc/ldap/slapd.conf. There should
 # already be something like this:
 

--- a/doc/dovecot-sql.conf	Sun Nov 05 18:12:14 2006 +0200
+++ b/doc/dovecot-sql.conf	Sun Nov 05 18:38:59 2006 +0200
@@ -1,3 +1,5 @@
+# This file is opened as root, so it should be owned by root and mode 0600.
+#
 # For the sql passdb module, you'll need a database with a table that
 # contains fields for at least the userid and password. If you want to
 # use the user@domain syntax, you might want to have a separate domain
@@ -54,7 +56,8 @@
 
 # Default password scheme.
 #
-# List of supported schemes is in: http://wiki.dovecot.org/Authentication
+# List of supported schemes is in
+# http://wiki.dovecot.org/Authentication/PasswordSchemes
 #
 #default_pass_scheme = PLAIN-MD5
 
@@ -62,7 +65,7 @@
 #
 # This query must return only one row with "user" and "password" columns.
 # The query can also return other fields which have a special meaning, see
-# http://wiki.dovecot.org/AuthSpecials
+# http://wiki.dovecot.org/PasswordDatabase/ExtraFields
 #
 # The "user" column is needed to make sure the username gets used with exactly
 # the same casing as it's in the database. Note that if you store username and
@@ -87,15 +90,16 @@
 
 # Query to retrieve the user information.
 #
-# The query must return only one row. The columns to return are:
-#   home - Home directory
-#   mail - MAIL environment
-#   system_user - System user name (for getting user's groups from /etc/group)
+# The query must return only one row. Commonly returned columns are:
 #   uid - System UID
 #   gid - System GID
+#   home - Home directory
+#   mail - Mail location
 #
 # Either home or mail is required. uid and gid are required. If more than one
-# row is returned or there's missing fields, login will automatically fail.
+# row is returned or there are missing fields, the login will fail. For a list
+# of all fields that can be returned, see 
+# http://wiki.dovecot.org/UserDatabase/ExtraFields
 #
 # Examples
 #   user_query = SELECT home, uid, gid FROM users WHERE userid = '%n' AND domain = '%d'