Merge 0.9->0.10

2 files changed, 3 insertions, 3 deletions

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index d190d631..67af6a14 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -373,7 +373,7 @@ function stream_callbacks.streamopened(session, attr)
 	elseif session.direction == "outgoing" then
 		session.notopen = nil;
 		if not attr.id then
-			log("error", "Stream response from %s did not give us a stream id!", session.to_host);
+			log("warn", "Stream response did not give us a stream id!");
 			session:close({ condition = "undefined-condition", text = "Missing stream ID" });
 			return;
 		end
diff --git a/prosodyctl b/prosodyctl
index adeb9e01..12c40c71 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -364,8 +364,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