Merge pull request #2197 from yangfl/master

treewide: Fix typos in comments

9 files changed, 17 insertions, 17 deletions

diff --git a/modules/luci-base/luasrc/dispatcher.luadoc b/modules/luci-base/luasrc/dispatcher.luadoc
index ddf534b3e..f26256953 100644
--- a/modules/luci-base/luasrc/dispatcher.luadoc
+++ b/modules/luci-base/luasrc/dispatcher.luadoc
@@ -22,7 +22,7 @@ Check whether a dispatch node shall be visible
 ]]
 
 ---[[
-Return a sorted table of visible childs within a given node
+Return a sorted table of visible children within a given node
 
 @class function
 @name node_childs
diff --git a/modules/luci-base/luasrc/http.lua b/modules/luci-base/luasrc/http.lua
index f4ede4b8a..20b55f285 100644
--- a/modules/luci-base/luasrc/http.lua
+++ b/modules/luci-base/luasrc/http.lua
@@ -335,13 +335,13 @@ end
 -- Content-Type. Stores all extracted data associated with its parameter name
 -- in the params table within the given message object. Multiple parameter
 -- values are stored as tables, ordinary ones as strings.
--- If an optional file callback function is given then it is feeded with the
+-- If an optional file callback function is given then it is fed with the
 -- file contents chunk by chunk and only the extracted file name is stored
 -- within the params table. The callback function will be called subsequently
 -- with three arguments:
 --  o Table containing decoded (name, file) and raw (headers) mime header data
 --  o String value containing a chunk of the file data
---  o Boolean which indicates wheather the current chunk is the last one (eof)
+--  o Boolean which indicates whether the current chunk is the last one (eof)
 function mimedecode_message_body(src, msg, file_cb)
 	local parser, header, field
 	local len, maxlen = 0, tonumber(msg.env.CONTENT_LENGTH or nil)
diff --git a/modules/luci-base/luasrc/http.luadoc b/modules/luci-base/luasrc/http.luadoc
index f8121230b..8f6f380d8 100644
--- a/modules/luci-base/luasrc/http.luadoc
+++ b/modules/luci-base/luasrc/http.luadoc
@@ -204,13 +204,13 @@ Stores all extracted data associated with its parameter name
 in the params table within the given message object. Multiple parameter
 values are stored as tables, ordinary ones as strings.
 
-If an optional file callback function is given then it is feeded with the
+If an optional file callback function is given then it is fed with the
 file contents chunk by chunk and only the extracted file name is stored
 within the params table. The callback function will be called subsequently
 with three arguments:
  o Table containing decoded (name, file) and raw (headers) mime header data
  o String value containing a chunk of the file data
- o Boolean which indicates wheather the current chunk is the last one (eof)
+ o Boolean which indicates whether the current chunk is the last one (eof)
 
 @class			function
 @name			mimedecode_message_body
diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index 2119a210b..a50e28a87 100644
--- a/modules/luci-base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
@@ -15,7 +15,7 @@ local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack
 -- cursor factory, modify data (via Cursor.add, Cursor.delete, etc.),
 -- save the changes to the staging area via Cursor.save and finally
 -- Cursor.commit the data to the actual config files.
--- LuCI then needs to Cursor.apply the changes so deamons etc. are
+-- LuCI then needs to Cursor.apply the changes so daemons etc. are
 -- reloaded.
 module "luci.model.uci"
 
diff --git a/modules/luci-base/luasrc/model/uci.luadoc b/modules/luci-base/luasrc/model/uci.luadoc
index d798b0033..0189d49aa 100644
--- a/modules/luci-base/luasrc/model/uci.luadoc
+++ b/modules/luci-base/luasrc/model/uci.luadoc
@@ -5,7 +5,7 @@ The typical workflow for UCI is:  Get a cursor instance from the
 cursor factory, modify data (via Cursor.add, Cursor.delete, etc.),
 save the changes to the staging area via Cursor.save and finally
 Cursor.commit the data to the actual config files.
-LuCI then needs to Cursor.apply the changes so deamons etc. are
+LuCI then needs to Cursor.apply the changes so daemons etc. are
 reloaded.
 @cstyle	instance
 ]]
@@ -172,7 +172,7 @@ has the same effect as deleting the option.
 ---[[
 Create a sub-state of this cursor.
 
-The sub-state is tied to the parent curser, means it the parent unloads or
+The sub-state is tied to the parent cursor, means it the parent unloads or
 loads configs, the sub state will do so as well.
 
 @class				function
@@ -339,7 +339,7 @@ Set the configuration directory.
 ]]
 
 ---[[
-Set the directory for uncommited changes.
+Set the directory for uncommitted changes.
 
 @class				function
 @name				Cursor.set_savedir
diff --git a/modules/luci-base/luasrc/sys.luadoc b/modules/luci-base/luasrc/sys.luadoc
index 1c1fa9260..3c7f69c6e 100644
--- a/modules/luci-base/luasrc/sys.luadoc
+++ b/modules/luci-base/luasrc/sys.luadoc
@@ -18,7 +18,7 @@ Execute a given shell command and capture its standard output
 @class		function
 @name		exec
 @param command	Command to call
-@return			String containg the return the output of the command
+@return			String containing the return the output of the command
 ]]
 
 ---[[
@@ -38,7 +38,7 @@ exists.
 @class		function
 @name		getenv
 @param var	Name of the environment variable to retrieve (optional)
-@return		String containg the value of the specified variable
+@return		String containing the value of the specified variable
 @return		Table containing all variables if no variable name is given
 ]]
 
@@ -279,7 +279,7 @@ LuCI system utilities / user related functions.
 ]]
 
 ---[[
-Retrieve user informations for given uid.
+Retrieve user information for given uid.
 
 @class		function
 @name		getuser
@@ -305,7 +305,7 @@ Test whether given string matches the password of a given system user.
 @name user.checkpasswd
 @param username	String containing the Unix user name
 @param pass		String containing the password to compare
-@return			Boolean indicating wheather the passwords are equal
+@return			Boolean indicating whether the passwords are equal
 ]]
 
 ---[[
diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index f16b3afb2..1a329f3f2 100644
--- a/modules/luci-base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
@@ -262,7 +262,7 @@ end
 
 -- one token per invocation, the tokens are separated by whitespace. If the
 -- input value is a table, it is transformed into a string first. A nil value
--- will result in a valid interator which aborts with the first invocation.
+-- will result in a valid iterator which aborts with the first invocation.
 function imatch(v)
 	if type(v) == "table" then
 		local k = nil
diff --git a/modules/luci-base/luasrc/util.luadoc b/modules/luci-base/luasrc/util.luadoc
index c4f28d039..4ec68dd1e 100644
--- a/modules/luci-base/luasrc/util.luadoc
+++ b/modules/luci-base/luasrc/util.luadoc
@@ -158,7 +158,7 @@ Return a matching iterator for the given value.
 
 The iterator will return one token per invocation, the tokens are separated by
 whitespace. If the input value is a table, it is transformed into a string first.
-A nil value will result in a valid interator which aborts with the first invocation.
+A nil value will result in a valid iterator which aborts with the first invocation.
 
 @class				function
 @name				imatch
@@ -289,7 +289,7 @@ will be stripped before it is returned.
 ]]
 
 ---[[
-Strips unnescessary lua bytecode from given string.
+Strips unnecessary lua bytecode from given string.
 
 Information like line numbers and debugging numbers will be discarded.
 Original version by Peter Cawley (http://lua-users.org/lists/lua-l/2008-02/msg01158.html)
diff --git a/modules/luci-base/src/template_utils.c b/modules/luci-base/src/template_utils.c
index 3979487f1..0411932ce 100644
--- a/modules/luci-base/src/template_utils.c
+++ b/modules/luci-base/src/template_utils.c
@@ -258,7 +258,7 @@ static int _validate_utf8(unsigned char **s, int l, struct template_buffer *buf)
 				break;
 		}
 
-		/* advance beyound the last found valid continuation char */
+		/* advance beyond the last found valid continuation char */
 		o = v;
 		ptr += v;
 	}