# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1294377077 0
# Node ID d78d5038d1446b63e734a4eba113c67dad604f9f
# Parent  0e5585910583854330e4f22bc33491293395db98# Parent  c53610fdab621280e68eb91d1f68904a00b51a81
Merge 0.8->trunk

diff -r 0e5585910583 -r d78d5038d144 prosody.cfg.lua.dist
--- a/prosody.cfg.lua.dist	Fri Jan 07 04:42:01 2011 +0000
+++ b/prosody.cfg.lua.dist	Fri Jan 07 05:11:17 2011 +0000
@@ -73,9 +73,10 @@
 -- (for some mad reason) want to disable
 -- them then uncomment them below
 modules_disabled = {
-	-- "presence";
-	-- "message";
-	-- "iq";
+	-- "presence"; -- Route user/contact status information
+	-- "message"; -- Route messages
+	-- "iq"; -- Route info queries
+	-- "offline"; -- Store offline messages
 };
 
 -- Disable account creation by default, for security
@@ -113,9 +114,10 @@
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-	info = "prosody.log"; -- Change info to debug for verbose logging
+	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
 	error = "prosody.err";
 	-- "*syslog"; -- Uncomment this for logging to syslog
+	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }
 
 ----------- Virtual hosts -----------