From 77949030e25e9e8e78953634c708cf6d3f209744 Mon Sep 17 00:00:00 2001
From: Bart van Strien <bart.bes+projects@gmail.com>
Date: Wed, 21 Dec 2016 09:54:37 +0100
Subject: [PATCH] Fix various spelling mistakes (mostly in luasocket)

Thanks to Alexandre Detiste for reporting them
---
 src/common/runtime.h                          | 2 +-
 src/libraries/luasocket/libluasocket/http.lua | 6 +++---
 src/libraries/luasocket/libluasocket/smtp.lua | 2 +-
 src/libraries/luasocket/libluasocket/url.lua  | 2 +-
 src/modules/graphics/opengl/Shader.cpp        | 2 +-
 src/scripts/boot.lua                          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/common/runtime.h b/src/common/runtime.h
index 9072c99db..acb76c2ed 100644
--- a/src/common/runtime.h
+++ b/src/common/runtime.h
@@ -465,7 +465,7 @@ T *luax_getmodule(lua_State *L, love::Type type)
 	lua_getfield(L, -1, name);
 
 	if (!lua_isuserdata(L, -1))
-		luaL_error(L, "Tried to get nonexistant module %s.", name);
+		luaL_error(L, "Tried to get nonexistent module %s.", name);
 
 	Proxy *u = (Proxy *)lua_touserdata(L, -1);
 
diff --git a/src/libraries/luasocket/libluasocket/http.lua b/src/libraries/luasocket/libluasocket/http.lua
index ad8db1ee0..fa81572a9 100644
--- a/src/libraries/luasocket/libluasocket/http.lua
+++ b/src/libraries/luasocket/libluasocket/http.lua
@@ -40,7 +40,7 @@ local function receiveheaders(sock, headers)
     while line ~= "" do
         -- get field-name and value
         name, value = socket.skip(2, string.find(line, "^(.-):%s*(.*)"))
-        if not (name and value) then return nil, "malformed reponse headers" end
+        if not (name and value) then return nil, "malformed response headers" end
         name = string.lower(name)
         -- get next line (value might be folded)
         line, err  = sock:receive()
@@ -67,7 +67,7 @@ socket.sourcet["http-chunked"] = function(sock, headers)
         dirty = function() return sock:dirty() end
     }, {
         __call = function()
-            -- get chunk size, skip extention
+            -- get chunk size, skip extension
             local line, err = sock:receive()
             if err then return nil, err end
             local size = base.tonumber(string.gsub(line, ";.*", ""), 16)
@@ -241,7 +241,7 @@ local function adjustrequest(reqt)
     if nreqt.port == "" then nreqt.port = 80 end
     socket.try(nreqt.host and nreqt.host ~= "", 
         "invalid host '" .. base.tostring(nreqt.host) .. "'")
-    -- compute uri if user hasn't overriden
+    -- compute uri if user hasn't overridden
     nreqt.uri = reqt.uri or adjusturi(nreqt)
     -- ajust host and port if there is a proxy
     nreqt.host, nreqt.port = adjustproxy(nreqt)
diff --git a/src/libraries/luasocket/libluasocket/smtp.lua b/src/libraries/luasocket/libluasocket/smtp.lua
index 8f3cfcff6..4f9e516d3 100644
--- a/src/libraries/luasocket/libluasocket/smtp.lua
+++ b/src/libraries/luasocket/libluasocket/smtp.lua
@@ -222,7 +222,7 @@ local function adjust_headers(mesgt)
     lower["date"] = lower["date"] or
         os.date("!%a, %d %b %Y %H:%M:%S ") .. (mesgt.zone or ZONE)
     lower["x-mailer"] = lower["x-mailer"] or socket._VERSION
-    -- this can't be overriden
+    -- this can't be overridden
     lower["mime-version"] = "1.0"
     return lower
 end
diff --git a/src/libraries/luasocket/libluasocket/url.lua b/src/libraries/luasocket/libluasocket/url.lua
index 0e31d8af2..eac717846 100644
--- a/src/libraries/luasocket/libluasocket/url.lua
+++ b/src/libraries/luasocket/libluasocket/url.lua
@@ -47,7 +47,7 @@ local function make_set(t)
 	return s
 end
 
--- these are allowed withing a path segment, along with alphanum
+-- these are allowed within a path segment, along with alphanum
 -- other characters must be escaped
 local segment_set = make_set {
     "-", "_", ".", "!", "~", "*", "'", "(",
diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp
index 16aff824a..e004d964a 100644
--- a/src/modules/graphics/opengl/Shader.cpp
+++ b/src/modules/graphics/opengl/Shader.cpp
@@ -172,7 +172,7 @@ GLuint Shader::compileCode(ShaderStage stage, const std::string &code)
 
 void Shader::mapActiveUniforms()
 {
-	// Built-in uniform locations default to -1 (nonexistant.)
+	// Built-in uniform locations default to -1 (nonexistent.)
 	for (int i = 0; i < int(BUILTIN_MAX_ENUM); i++)
 		builtinUniforms[i] = -1;
 
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index 50b31c6e6..742756b1a 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -260,7 +260,7 @@ end
 
 local no_game_code = false
 
--- This can't be overriden.
+-- This can't be overridden.
 function love.boot()
 
 	-- This is absolutely needed.