Merge with 0.4

3 files changed, 9 insertions, 3 deletions

diff --git a/HACKERS b/HACKERS
index 23b7c56c..a8585af0 100644
--- a/HACKERS
+++ b/HACKERS
@@ -1,5 +1,10 @@
 Welcome hackers!
 
-This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list and discussion rooms. More information on these at http://prosody.im/discuss
+This project accepts and *encourages* contributions. If you would like to get 
+involved you can join us on our mailing list and discussion rooms. More 
+information on these at http://prosody.im/discuss
 
-Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code, and are comfortable with copyright of contributions being assigned to the core developers.
+Patches are welcome, though before sending we would appreciate if you read 
+docs/coding_style.txt for guidelines on how to format your code, and are 
+comfortable with copyright of contributions being assigned to the core 
+developers.
diff --git a/configure b/configure
index 2d304dc2..bd8eb48c 100755
--- a/configure
+++ b/configure
@@ -86,7 +86,7 @@ do
       OSTYPE="$value"
       OSTYPE_SET=yes
       ;;
-   --data-dir=*)
+   --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 13b091cc..ea0f497d 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -122,6 +122,7 @@ end
 
 --- Definition of built-in logging sinks ---
 
+-- Null sink, must enter log_sink_types *first*
 function log_sink_types.nowhere()
 	return function () return false; end;
 end