# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1603376889 -3600
# Node ID 4300839a28ca4bca5eee7c7eb250eed26ed6ca0e
# Parent  5c77923ec1d980ea2e39c6ab4ac086fb3cfc8886# Parent  bde804b01f28b27da2db8085f9de79866408a101
Merge

diff -r 5c77923ec1d9 -r 4300839a28ca buildscripts/squish
--- a/buildscripts/squish	Thu Oct 22 15:27:48 2020 +0100
+++ b/buildscripts/squish	Thu Oct 22 15:28:09 2020 +0100
@@ -2197,7 +2197,7 @@
   }\
 }\
 else {\
-  // Unreachable because SHELL is dependant on the others\
+  // Unreachable because SHELL is dependent on the others\
   throw 'Unknown runtime environment. Where are we?';\
 }\
 function globalEval(x) {\
@@ -2562,7 +2562,7 @@
 // @param ident      The name of the C function (note that C++ functions will be name-mangled - use extern \"C\")\
 // @param returnType The return type of the function, one of the JS types 'number', 'string' or 'array' (use 'number' for any C pointer, and\
 //                   'array' for JavaScript arrays and typed arrays; note that arrays are 8-bit).\
-// @param argTypes   An array of the types of arguments for the function (if there are no arguments, this can be ommitted). Types are as in returnType,\
+// @param argTypes   An array of the types of arguments for the function (if there are no arguments, this can be omitted). Types are as in returnType,\
 //                   except that 'array' is not possible (there is no way for us to know the length of the array)\
 // @param args       An array of the arguments to the function, as native JS values (as in returnType)\
 //                   Note that string arguments will be stored on the stack (the JS string will become a C string on the stack).\
diff -r 5c77923ec1d9 -r 4300839a28ca plugins/archive.lua
--- a/plugins/archive.lua	Thu Oct 22 15:27:48 2020 +0100
+++ b/plugins/archive.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -42,7 +42,6 @@
 			local result_tag = message:get_child("result", xmlns_mam);
 			if result_tag and result_tag.attr.queryid == queryid then
 				local forwarded = result_tag:get_child("forwarded", xmlns_forward);
-				forwarded = forwarded or message:get_child("forwarded", xmlns_forward); -- COMPAT XEP-0313 pre 2013-05-31
 
 				local id = result_tag.attr.id;
 				local delay = forwarded:get_child("delay", xmlns_delay);
@@ -63,9 +62,9 @@
 				callback(false, reply:get_error())
 				return true;
 			end
-			local finnished = reply:get_child("fin", xmlns_mam)
-			if finnished then
-				local rset = rsm.get(finnished);
+			local finished = reply:get_child("fin", xmlns_mam)
+			if finished then
+				local rset = rsm.get(finished);
 				for k,v in pairs(rset or NULL) do results[k]=v; end
 			end
 			callback(results);
diff -r 5c77923ec1d9 -r 4300839a28ca plugins/jingle_ibb.lua
--- a/plugins/jingle_ibb.lua	Thu Oct 22 15:27:48 2020 +0100
+++ b/plugins/jingle_ibb.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -28,7 +28,7 @@
 		return self:feed(stanza)
 	end
 	self.feeder = feeder;
-	print("Hooking incomming IQs");
+	print("Hooking incoming IQs");
 	local stream = self.stream;
 		stream:hook("iq/".. xmlns_ibb, feeder)
 	if stanza == "message" then
diff -r 5c77923ec1d9 -r 4300839a28ca plugins/tls.lua
--- a/plugins/tls.lua	Thu Oct 22 15:27:48 2020 +0100
+++ b/plugins/tls.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -10,7 +10,7 @@
 			stream:send(verse.stanza("starttls", { xmlns = xmlns_tls }));
 			return true;
 		elseif not stream.conn.starttls and not stream.secure then
-			stream:warn("SSL libary (LuaSec) not loaded, so TLS not available");
+			stream:warn("SSL library (LuaSec) not loaded, so TLS not available");
 		elseif not stream.secure then
 			stream:debug("Server doesn't offer TLS :(");
 		end