Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 02 Jan 2017 03:06:51 +0100
changeset 7806 4d182b9a8109
parent 7803 dadf9ba290c5 (current diff)
parent 7805 802dc0691177 (diff)
child 7811 0494bf73dfee
Merge 0.10->trunk
prosody
--- a/core/stanza_router.lua	Sun Jan 01 19:42:12 2017 +0100
+++ b/core/stanza_router.lua	Mon Jan 02 03:06:51 2017 +0100
@@ -74,7 +74,7 @@
 				origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing required 'id' attribute"));
 				return;
 			elseif (st_type == "set" or st_type == "get") and (#stanza.tags ~= 1) then
-				origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanz"));
+				origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanza"));
 				return;
 			end
 		end
--- a/prosody	Sun Jan 01 19:42:12 2017 +0100
+++ b/prosody	Mon Jan 02 03:06:51 2017 +0100
@@ -95,7 +95,7 @@
 		print("\n");
 		print("**************************");
 		if level == "parser" then
-			print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
+			print("A problem occurred while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
 			print("");
 			local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)");
 			if err:match("chunk has too many syntax levels$") then