--- a/dovecot-example.conf	Fri Jun 16 12:47:13 2006 +0300
+++ b/dovecot-example.conf	Fri Jun 16 12:47:57 2006 +0300
@@ -847,44 +847,36 @@
   # Take the username from client's SSL certificate, using X509_NAME_oneline()
   # which typically uses subject's Distinguished Name.
   #ssl_username_from_cert = no
-}
 
-# It's possible to export the authentication interface to other programs,
-# for example SMTP server which supports talking to Dovecot. Client socket
-# handles the actual authentication - you give it a username and password
-# and it returns OK or failure. So it's pretty safe to allow anyone access to
-# it. Master socket is used to a) query if given client was successfully
-# authenticated, b) userdb lookups.
-
-# listener sockets will be created by Dovecot's master process using the
-# settings given inside the auth section
-#auth default_with_listener {
-#  mechanisms = plain
-#  passdb pam {
-#  }
-#  userdb passwd {
-#  }
+  # It's possible to export the authentication interface to other programs:
 #  socket listen {
 #    master {
-#      path = /var/run/dovecot/auth-master
+#      # Master socket is typically used to give Dovecot's local delivery
+#      # agent access to userdb so it can find mailbox locations. It can
+#      # however also be used to disturb regular user authentications.
 #      # WARNING: Giving untrusted users access to master socket may be a 
 #      # security risk, don't give too wide permissions to it!
+#      path = /var/run/dovecot/auth-master
 #      #mode = 0600
 #      # Default user/group is the one who started dovecot-auth (root)
 #      #user = 
 #      #group = 
 #    }
 #    client {
+#      # The client socket is generally safe to export to everyone. Typical use
+#      # is to export it to your SMTP server so it can do SMTP AUTH lookups
+#      # using it.
 #      path = /var/run/dovecot/auth-client
 #      mode = 0660
 #    }
 #  }
-#}
+}
 
-# connect sockets are assumed to be already running, Dovecot's master
+# If you wish to use another authentication server than dovecot-auth, you can
+# use connect sockets. They assumed to be already running, Dovecot's master
 # process only tries to connect to them. They don't need any other settings
-# than path for the master socket, as the configuration is done elsewhere.
-# Note that the client sockets must exist in login_dir.
+# than the path for the master socket, as the configuration is done elsewhere.
+# Note that the client sockets must exist in the login_dir.
 #auth external {
 #  socket connect {
 #    master {