Merge 0.8->trunk

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 418505376b3a126adf5901b24daaca78dc9b14d3..d1bd7d67ae91027b104b05237a2607dda85ff8c8 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -73,9 +73,10 @@ modules_enabled = {
 -- (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 @@ ssl = {
 -- 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 -----------