diff --git a/modules/android/vsandroid_androidproj.lua b/modules/android/vsandroid_androidproj.lua
index 9ea170f6..4c5a5819 100644
--- a/modules/android/vsandroid_androidproj.lua
+++ b/modules/android/vsandroid_androidproj.lua
@@ -155,8 +155,8 @@
 	end)
 
 	function android.link(cfg, file)
-		-- default the seperator to '/' as that is what is searched for
-		-- below. Otherwise the function will use target seperator which
+		-- default the separator to '/' as that is what is searched for
+		-- below. Otherwise the function will use target separator which
 		-- could be '\\' and result in failure to create links.
 		local fname = path.translate(file.relpath, '/')
 
diff --git a/modules/d/actions/gmake.lua b/modules/d/actions/gmake.lua
index edb64171..8a5471f5 100644
--- a/modules/d/actions/gmake.lua
+++ b/modules/d/actions/gmake.lua
@@ -48,7 +48,7 @@
 
 
 --
--- Override the GMake action 'onProject' funtion to provide
+-- Override the GMake action 'onProject' function to provide
 -- D knowledge...
 --
 	p.override( gmake, "onProject", function(oldfn, prj)
diff --git a/modules/d/actions/vcxproj.lua b/modules/d/actions/vcxproj.lua
index 019d1ef1..548bbaea 100644
--- a/modules/d/actions/vcxproj.lua
+++ b/modules/d/actions/vcxproj.lua
@@ -32,7 +32,7 @@
 
 	function m.dCompiler(cfg)
 		local dc = nil
-		-- TODO: chech for explicit DMD or LDC request?
+		-- TODO: check for explicit DMD or LDC request?
 		if _OPTIONS.dc then
 			local dcMap = {
 				["dmd"] = "DMD",
diff --git a/modules/d/d.lua b/modules/d/d.lua
index 3fcb458b..c7fb3f32 100644
--- a/modules/d/d.lua
+++ b/modules/d/d.lua
@@ -24,7 +24,7 @@
 	end
 
 --
--- Patch the path table to provide knowledge of D file extenstions
+-- Patch the path table to provide knowledge of D file extensions
 --
 	function path.isdfile(fname)
 		return path.hasextension(fname, { ".d" })
diff --git a/modules/gmake/gmake.lua b/modules/gmake/gmake.lua
index 4c184d3d..43b1091f 100644
--- a/modules/gmake/gmake.lua
+++ b/modules/gmake/gmake.lua
@@ -139,7 +139,7 @@
 
 --
 -- Rules for file ops based on the shell type. Can't use defines and $@ because
--- it screws up the escaping of spaces and parethesis (anyone know a fix?)
+-- it screws up the escaping of spaces and parenthesis (anyone know a fix?)
 --
 
 	function make.mkdir(dirname)
diff --git a/modules/gmake/tests/cpp/test_ldflags.lua b/modules/gmake/tests/cpp/test_ldflags.lua
index 0007b68f..57d9f619 100644
--- a/modules/gmake/tests/cpp/test_ldflags.lua
+++ b/modules/gmake/tests/cpp/test_ldflags.lua
@@ -39,7 +39,7 @@
 	end
 
 --
--- Check addition of library search directores.
+-- Check addition of library search directories.
 --
 
 	function suite.checkLibDirs()
diff --git a/modules/gmake2/gmake2.lua b/modules/gmake2/gmake2.lua
index fdf1ed8d..b8be8d22 100644
--- a/modules/gmake2/gmake2.lua
+++ b/modules/gmake2/gmake2.lua
@@ -118,7 +118,7 @@
 
 --
 -- Rules for file ops based on the shell type. Can't use defines and $@ because
--- it screws up the escaping of spaces and parethesis (anyone know a fix?)
+-- it screws up the escaping of spaces and parenthesis (anyone know a fix?)
 --
 
 	function gmake2.mkdir(dirname)
diff --git a/modules/gmake2/tests/test_gmake2_ldflags.lua b/modules/gmake2/tests/test_gmake2_ldflags.lua
index b3a81eb8..5945b32a 100644
--- a/modules/gmake2/tests/test_gmake2_ldflags.lua
+++ b/modules/gmake2/tests/test_gmake2_ldflags.lua
@@ -40,7 +40,7 @@ ALL_LDFLAGS += $(LDFLAGS)
 	end
 
 --
--- Check addition of library search directores.
+-- Check addition of library search directories.
 --
 
 	function suite.checkLibDirs()
diff --git a/modules/self-test/test_assertions.lua b/modules/self-test/test_assertions.lua
index 6e9efc58..c2de20ac 100644
--- a/modules/self-test/test_assertions.lua
+++ b/modules/self-test/test_assertions.lua
@@ -82,7 +82,7 @@
 			format = table.remove(arg, 1)
 		end
 
-		-- convert nils into something more usefuls
+		-- convert nils into something more useful
 		for i = 1, #arg do
 			if (arg[i] == nil) then
 				arg[i] = "(nil)"
diff --git a/modules/vstudio/tests/vc2010/test_config_props.lua b/modules/vstudio/tests/vc2010/test_config_props.lua
index 78f0c71e..9b93a28e 100644
--- a/modules/vstudio/tests/vc2010/test_config_props.lua
+++ b/modules/vstudio/tests/vc2010/test_config_props.lua
@@ -45,7 +45,7 @@
 
 
 --
--- Check the configuration type for differenet project kinds.
+-- Check the configuration type for different project kinds.
 --
 
 	function suite.configurationType_onConsoleApp()
diff --git a/modules/vstudio/tests/vc2010/test_output_props.lua b/modules/vstudio/tests/vc2010/test_output_props.lua
index 9ab61b83..9ec9a445 100644
--- a/modules/vstudio/tests/vc2010/test_output_props.lua
+++ b/modules/vstudio/tests/vc2010/test_output_props.lua
@@ -112,7 +112,7 @@
 	end
 
 --
--- The objeccts directory is applied, if specified.
+-- The objects directory is applied, if specified.
 --
 
 	function suite.intDir_onTargetDir()
diff --git a/src/base/_foundation.lua b/src/base/_foundation.lua
index 6c2413f1..ce70e6b5 100644
--- a/src/base/_foundation.lua
+++ b/src/base/_foundation.lua
@@ -137,16 +137,16 @@
 
 ---
 -- Compare a version string that uses semver semantics against a
--- version comparision string. Comparisions take the form of ">=5.0" (5.0 or
+-- version comparison string. Comparisons take the form of ">=5.0" (5.0 or
 -- later), "5.0" (5.0 or later), ">=5.0 <6.0" (5.0 or later but not 6.0 or
 -- later).
 --
 -- @param version
 --    The version to be tested.
 -- @param checks
---    The comparision string to be evaluated.
+--    The comparison string to be evaluated.
 -- @return
---    True if the comparisions pass, false if any fail.
+--    True if the comparisons pass, false if any fail.
 ---
 
 	function p.checkVersion(version, checks)
diff --git a/src/base/api.lua b/src/base/api.lua
index 1824aabe..29aa546e 100755
--- a/src/base/api.lua
+++ b/src/base/api.lua
@@ -15,7 +15,7 @@
 
 ---
 -- Set up a place to store the current active objects in each configuration
--- scope (e.g. wprkspaces, projects, groups, and configurations). This likely
+-- scope (e.g. workspaces, projects, groups, and configurations). This likely
 -- ought to be internal scope, but it is useful for testing.
 ---
 
@@ -25,7 +25,7 @@
 
 ---
 -- Define a new class of configuration container. A container can receive and
--- store configuration blocks, which are what hold the individial settings
+-- store configuration blocks, which are what hold the individual settings
 -- from the scripts. A container can also hold one or more kinds of child
 -- containers; a workspace can contain projects, for instance.
 --
@@ -489,7 +489,7 @@
 
 --
 -- Callback for all API functions; everything comes here first, and then
--- gets parceled out to the individual set...() functions.
+-- gets parcelled out to the individual set...() functions.
 --
 
 	function api.storeField(field, value)
diff --git a/src/base/config.lua b/src/base/config.lua
index c936b57f..ba1b66f8 100755
--- a/src/base/config.lua
+++ b/src/base/config.lua
@@ -310,7 +310,7 @@
 			end
 
 			-- If this is something I can link against, pull out the requested part
-			-- dont link against my self
+			-- don't link against my self
 			if item and item ~= cfg then
 				if part == "directory" then
 					item = path.getdirectory(item)
@@ -340,10 +340,10 @@
 
 --
 -- Returns the list of sibling target directories
--- 
+--
 -- @param cfg
 --    The configuration object to query.
--- @return 
+-- @return
 --    Absolute path list
 --
 	function config.getsiblingtargetdirs(cfg)
diff --git a/src/base/detoken.lua b/src/base/detoken.lua
index 162ae104..5f99fbc1 100644
--- a/src/base/detoken.lua
+++ b/src/base/detoken.lua
@@ -41,7 +41,7 @@
 				end
 			end
 
-			-- fetch the pathVars from the enviroment.
+			-- fetch the pathVars from the environment.
 			local envMap = e.pathVars or {}
 
 			-- enable access to the global environment
diff --git a/src/base/globals.lua b/src/base/globals.lua
index 9dbb7093..5946db8d 100644
--- a/src/base/globals.lua
+++ b/src/base/globals.lua
@@ -42,7 +42,7 @@
 -- @param fname
 --    The name of the directory or file to include. If a directory, will
 --    automatically include the contained premake5.lua or premake4.lua
---    script at that lcoation.
+--    script at that location.
 ---
 
 	io._includedFiles = {}
diff --git a/src/base/group.lua b/src/base/group.lua
index 0d98a102..ce6f9347 100644
--- a/src/base/group.lua
+++ b/src/base/group.lua
@@ -1,6 +1,6 @@
 ---
 -- group.lua
--- A psuedo-configuration container to represent project groups.
+-- A pseudo-configuration container to represent project groups.
 -- Copyright (c) 2014 Jason Perkins and the Premake project
 ---
 
diff --git a/src/base/option.lua b/src/base/option.lua
index a8cf8b1f..2d0f1ead 100644
--- a/src/base/option.lua
+++ b/src/base/option.lua
@@ -12,7 +12,7 @@
 --
 -- We can't control how people will type in the command line arguments, or how
 -- project scripts will define their custom options, so case becomes an issue.
--- To mimimize issues, set up the _OPTIONS table to always use lowercase keys.
+-- To minimize issues, set up the _OPTIONS table to always use lowercase keys.
 --
 
 	local _OPTIONS_metatable = {
diff --git a/src/base/os.lua b/src/base/os.lua
index 60df4bd6..c195050e 100644
--- a/src/base/os.lua
+++ b/src/base/os.lua
@@ -742,7 +742,7 @@
 		local translateFunction = function(value)
 			local result = path.join(translatedBaseDir, value)
 			result = os.translateCommandAndPath(result, map)
-			if value:endswith('/') or value:endswith('\\') or -- if orginal path ends with a slash then ensure the same
+			if value:endswith('/') or value:endswith('\\') or -- if original path ends with a slash then ensure the same
 			   value:endswith('/"') or value:endswith('\\"') then
 				result = result .. '/'
 			end
diff --git a/src/base/oven.lua b/src/base/oven.lua
index 79e48ed6..9e2ab5c4 100644
--- a/src/base/oven.lua
+++ b/src/base/oven.lua
@@ -712,7 +712,7 @@
 			local lowerobj = f.objname:lower()
 			if not bases[lowerobj] then
 				-- this is the first appearance of a file that produces this objname
-				-- intialize the table for any future basename that matches our objname
+				-- initialize the table for any future basename that matches our objname
 				bases[lowerobj] = {}
 			end
 
diff --git a/src/base/path.lua b/src/base/path.lua
index d46a8aa4..8136722a 100644
--- a/src/base/path.lua
+++ b/src/base/path.lua
@@ -292,7 +292,7 @@
 	end
 
 --
--- Get the default seperator for path.translate
+-- Get the default separator for path.translate
 --
 
 	function path.getDefaultSeparator()
diff --git a/src/base/project.lua b/src/base/project.lua
index 69aba8de..d17d6ce8 100755
--- a/src/base/project.lua
+++ b/src/base/project.lua
@@ -506,7 +506,7 @@
 -- and returns a new (or the same) pairing.
 --
 -- TODO: I think this could be made much simpler by building a string pattern
--- like :part1:part2: and then doing string comparisions, instead of trying to
+-- like :part1:part2: and then doing string comparisons, instead of trying to
 -- iterate over variable number of table elements.
 --
 
diff --git a/src/base/table.lua b/src/base/table.lua
index d317586c..ce38aca5 100644
--- a/src/base/table.lua
+++ b/src/base/table.lua
@@ -522,7 +522,7 @@
 	end
 
 --
--- Filters a table for empty entries. primarly useful for lists of string.
+-- Filters a table for empty entries. primarily useful for lists of string.
 --
 	function table.filterempty(dirs)
 		return table.translate(dirs, function(val)
diff --git a/src/base/workspace.lua b/src/base/workspace.lua
index 22b268f2..805b4382 100644
--- a/src/base/workspace.lua
+++ b/src/base/workspace.lua
@@ -84,7 +84,7 @@
 -- Locate a project by name, case insensitive.
 --
 -- @param name
---    The name of the projec to find.
+--    The name of the project to find.
 -- @return
 --    The project object, or nil if a matching project could not be found.
 --
diff --git a/tests/config/test_targetinfo.lua b/tests/config/test_targetinfo.lua
index 535c68d5..9d75bd58 100755
--- a/tests/config/test_targetinfo.lua
+++ b/tests/config/test_targetinfo.lua
@@ -149,7 +149,7 @@
 
 
 --
--- Name should use "lib and ".a" for Mac static libraries.
+-- Name should use "lib" and ".a" for Mac static libraries.
 --
 
 	function suite.nameUsesLib_onMacStaticLib()