Merge 0.10->trunk

diff --combined prosodyctl
index 92606dd2537c82f353b032e954e63cea2f0b0869,c8366faf9ae68193ccc98767f8ea68fd62a4f047..1fff7eed5a4f0d228c6fe5bc4704f3dd780f7626
--- 1/prosodyctl
--- 2/prosodyctl
+++ b/prosodyctl
@@@ -365,8 -365,8 +365,8 @@@ function commands.deluser(arg
        end
        local user, host = jid_split(arg[1]);
        if not user and host then
 -              show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
 -              show_usage [[passwd user@host]]
 +              show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
 +              show_usage [[deluser user@host]]
                return 1;
        end
        
@@@ -1063,11 -1063,15 +1063,15 @@@ function commands.check(arg
                
                local v6_supported = not not socket.tcp6;
                
-               for host, host_options in enabled_hosts() do
+               for jid, host_options in enabled_hosts() do
                        local all_targets_ok, some_targets_ok = true, false;
+                       local node, host = jid_split(jid);
                        
                        local is_component = not not host_options.component_module;
-                       print("Checking DNS for "..(is_component and "component" or "host").." "..host.."...");
+                       print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
+                       if node then
+                               print("Only the domain part ("..host..") is used in DNS.")
+                       end
                        local target_hosts = set.new();
                        if not is_component then
                                local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");