Merge pull request #2197 from yangfl/master

treewide: Fix typos in comments

13 files changed, 28 insertions, 28 deletions

diff --git a/applications/luci-app-asterisk/luasrc/asterisk.lua b/applications/luci-app-asterisk/luasrc/asterisk.lua
index ceb738d112..da94c556f9 100644
--- a/applications/luci-app-asterisk/luasrc/asterisk.lua
+++ b/applications/luci-app-asterisk/luasrc/asterisk.lua
@@ -35,7 +35,7 @@ function io.exec(command)
 	return buffer
 end
 
---- Execute command and invoke given callback for each readed line
+--- Execute command and invoke given callback for each read line
 -- @param command	String containing the command to execute
 -- @param callback	Function to call back for each line
 -- @return			Always true
@@ -53,7 +53,7 @@ function io.execl(command, callback)
 	return true
 end
 
---- Execute command and return an iterator that returns one line per invokation
+--- Execute command and return an iterator that returns one line per invocation
 -- @param command	String containing the command to execute
 -- @return			Iterator function
 function io.execi(command)
@@ -71,7 +71,7 @@ end
 --- LuCI Asterisk - core status
 core = luci.util.class()
 
---- Retrive version string.
+--- Retrieve version string.
 -- @return	String containing the reported asterisk version
 function core.version(self)
 	local version = io.exec("core show version")
@@ -141,7 +141,7 @@ function sip.peers(self)
 	return peers
 end
 
---- Get informations of given SIP peer
+--- Get information of given SIP peer
 -- @param peer	String containing the name of the SIP peer
 function sip.peer(peer)
 	local info = { }
@@ -217,7 +217,7 @@ end
 --- Convert given list to a collection of hyperlinks
 -- @param list	Table of tokens
 -- @param url	String pattern or callback function to construct urls (optional)
--- @param sep	String containing the seperator (optional, default is ", ")
+-- @param sep	String containing the separator (optional, default is ", ")
 -- @return		String containing the html fragment
 function tools.hyperlinks(list, url, sep)
 	local html
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
index 66a06b20f7..3cbc5002be 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
@@ -126,7 +126,7 @@
 			<div class="cbi-section-create cbi-tblsection-create" style="padding: 3px">
 				<h3>Create a new dialzone</h3>
 				The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .<br />
-				You can specifiy multiple number matches by separating them with spaces.<br />
+				You can specify multiple number matches by separating them with spaces.<br />
 
 				<%- if create_error then %>
 					<br /><span style="color:red">Invalid name given!</span><br />
diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
index eb2159076e..ecabec4e22 100644
--- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua
@@ -90,7 +90,7 @@ end
 -- will use dynamic_dns_lucihelper to check if
 -- local IP can be read
 local function _verify_ip_source()
-	-- section is globally defined here be calling agrument (see above)
+	-- section is globally defined here be calling argument (see above)
 	local _arg
 
 	local _ipv6   = usev6:formvalue(section)
@@ -173,7 +173,7 @@ end
 
 -- function to verify if option is valid
 local function _option_validate(self, value, optional)
-	-- section is globally defined here be calling agrument (see above)
+	-- section is globally defined here be calling argument (see above)
 	local fusev6 = usev6:formvalue(section) or "0"
 	local fsvc4  = svc4:formvalue(section) or "-"
 	local fsvc6  = svc6:formvalue(section) or "-"
@@ -200,7 +200,7 @@ local function _option_validate(self, value, optional)
 	if (#urlsh == 0) then return "" end
 
 	used = _option_used(self.option, urlsh)
-	-- on error or not used return empty sting
+	-- on error or not used return empty string
 	if used < 1 then return "" end
 	-- needed but no data then return error
 	if not value or (#value == 0) then
diff --git a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
index 49435a4a33..60a103adfb 100644
--- a/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
+++ b/applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
@@ -329,7 +329,7 @@ function place_new_nodes() {
 			}
 		}
 		else {
-			// beginn somewhere
+			// begin somewhere
 			n.x = Math.random()*400;
 			n.y = Math.random()*400;
 		}
diff --git a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua b/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua
index 90754c2bc1..722af19e21 100644
--- a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua
+++ b/applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua
@@ -544,7 +544,7 @@ function bl.validate(self, value)
 	elseif v < 1 or v > 4096 then
 		return nil, err_tab_access(self.title_base, translate("Value not between 1 and 4096") )
 	elseif v == self.default then
-		return ""	-- dont need to save default
+		return ""	-- don't need to save default
 	end
 	return value
 end
@@ -721,7 +721,7 @@ function st.validate(self, value)
 	elseif v < 1 then
 		return nil, err_tab_misc(self.title_base, translate("Value not greater 0 or empty") )
 	elseif v == self.default then
-		return ""	-- dont need to save default
+		return ""	-- don't need to save default
 	end
 	return value
 end
@@ -740,7 +740,7 @@ function mcc.validate(self, value)
 	elseif v < 1 then
 		return nil, err_tab_misc(self.title_base, translate("Value not greater 0 or empty") )
 	elseif v == self.default then
-		return ""	-- dont need to save default
+		return ""	-- don't need to save default
 	end
 	return value
 end
diff --git a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
index 0d738326a0..413b3b481f 100644
--- a/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-app-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -167,7 +167,7 @@ function mode.write(self, section, value)
 	--	* wl0 gets an ipv6 address, in this case the fdca:ffee:babe::1:1/64
 	--	* we do a ::ffff:ffff:0/96 route into siit0, so everything from 6mesh goes into translation.
 	--	* an HNA6 of ::ffff:ffff:0:0/96 announces the mapped 0.0.0.0/0 ipv4 space.
-	--	* MTU on WAN, LAN down to 1400, ipv6 headers are slighly larger.
+	--	* MTU on WAN, LAN down to 1400, ipv6 headers are slightly larger.
 
 	if value == "gateway" then
 
diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm
index 8d84463ef7..64c326ff3a 100644
--- a/applications/luci-app-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm
@@ -81,7 +81,7 @@ if has_custom_splash then
 	is limited and because of this we ask you not to do any of the following:%></p>
 	<ul>
 		<li><%:use filesharing applications on this network%></li>
-		<li><%:waste bandwidth with unneccesary downloads or streams%></li>
+		<li><%:waste bandwidth with unnecessary downloads or streams%></li>
 		<li><%:perform any kind of illegal activities%></li>
 	</ul>
 	<br />
diff --git a/applications/luci-app-splash/root/etc/init.d/luci_splash b/applications/luci-app-splash/root/etc/init.d/luci_splash
index feefabd81a..01a606c321 100755
--- a/applications/luci-app-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-app-splash/root/etc/init.d/luci_splash
@@ -237,12 +237,12 @@ start() {
 	[ -s $IPT_REPLAY ] && . $IPT_REPLAY
 	echo -n > $IPT_REPLAY
 
-	### Add interface independant prerouting rules
+	### Add interface independent prerouting rules
 	$IPT -t nat -A luci_splash_prerouting -j luci_splash_leases
 	$IPT -t nat -A luci_splash_leases -p udp --dport 53 -j REDIRECT --to-ports 53
 	$IPT -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082
 
-	### Add interface independant forwarding rules
+	### Add interface independent forwarding rules
 	$IPT -t filter -A luci_splash_forwarding -j luci_splash_filter
 	$IPT -t filter -A luci_splash_filter -p tcp -j REJECT --reject-with tcp-reset
 	$IPT -t filter -A luci_splash_filter -j REJECT --reject-with icmp-net-prohibited
diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index ec26f02d0d..de7bdbadfe 100644
--- a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -10,7 +10,7 @@ function index()
 	require("luci.util")
 	require("luci.statistics.datatree")
 
-	-- override entry(): check for existance <plugin>.so where <plugin> is derived from the called path
+	-- override entry(): check for existence <plugin>.so where <plugin> is derived from the called path
 	function _entry( path, ... )
 		local file = path[5] or path[4]
 		if nixio.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
index 6f687d218d..6ca65e539f 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
@@ -17,7 +17,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
 		-- diagram data description
 		data = {
-			-- defined sources for data types, if ommitted assume a single DS named "value" (optional)
+			-- defined sources for data types, if omitted assume a single DS named "value" (optional)
 			sources = {
 				if_octets = { "tx", "rx" }
 			},
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
index 7b6acf3663..a612126ed0 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
@@ -14,7 +14,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
 		-- diagram data description
 		data = {
-			-- defined sources for data types, if ommitted assume a single DS named "value" (optional)
+			-- defined sources for data types, if omitted assume a single DS named "value" (optional)
 			sources = {
 				if_octets = { "tx", "rx" }
 			},
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
index 798ca6a45c..3a13c23df9 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
@@ -58,7 +58,7 @@ end
 
 
 function ztype.cfgvalue(self, s)
-    -- Format a meaninful tile for the Zone Type column
+    -- Format a meaningful tile for the Zone Type column
     local itxt = self.map:get(s, "zone_type")
     local itls = self.map:get(s, "tls_upstream")
 
@@ -84,7 +84,7 @@ end
 
 
 function zones.cfgvalue(self, s)
-    -- Format a meaninful sentence for the Zones viewed column
+    -- Format a meaningful sentence for the Zones viewed column
     local xtxt, otxt
     local itxt = self.map:get(s, "zone_name")
     local itype = self.map:get(s, "zone_type")
@@ -131,7 +131,7 @@ end
 
 
 function servers.cfgvalue(self, s)
-    -- Format a meaninful sentence for the Servers (and URL) column
+    -- Format a meaningful sentence for the Servers (and URL) column
     local xtxt, otxt, rtxt, found
     local itxt = self.map:get(s, "server")
     local iurl = self.map:get(s, "url_dir")
diff --git a/applications/luci-app-wifischedule/README.md b/applications/luci-app-wifischedule/README.md
index 591abb1049..4a57b3f7b4 100644
--- a/applications/luci-app-wifischedule/README.md
+++ b/applications/luci-app-wifischedule/README.md
@@ -7,7 +7,7 @@ Turns WiFi on and off according to a schedule on an openwrt router
 
 
 ## Use cases
-You can create user-defined events when to enable or disable WiFi. 
+You can create user-defined events when to enable or disable WiFi.
 There are various use cases why you would like to do so:
 
 1. Reduce power consumption and therefore reduce CO2 emissions.
@@ -17,13 +17,13 @@ There are various use cases why you would like to do so:
 Regarding 1: Please note, that you need to unload the wireless driver modules in order to get the most effect of saving power.
 In my test scenario only disabling WiFi saves about ~0.4 Watt, unloading the modules removes another ~0.4 Watt.
 
-Regarding 2: Think of a wireless accesspoint e.g. in your bedrom, kids room where you want to remove the ammount of radiation emitted.
+Regarding 2: Think of a wireless accesspoint e.g. in your bedrom, kids room where you want to remove the amount of radiation emitted.
 
-Regarding 3: E.g. in a company, why would wireless need to be enabled weekends if no one is there working? 
+Regarding 3: E.g. in a company, why would wireless need to be enabled weekends if no one is there working?
 Or think of an accesspoint in your kids room when you want the youngsters to sleep after 10 pm instead of facebooking...
 
 ## Configuration
-You can create an arbitrary number of schedule events. Please note that there is on sanity check done wheather the start / stop times overlap or make sense.
+You can create an arbitrary number of schedule events. Please note that there is on sanity check done whether the start / stop times overlap or make sense.
 If start and stop time are equal, this leads to disabling the WiFi at the given time.
 
 Logging if enabled is done to the file `/var/log/wifi_schedule.log` and can be reviewed through the "View Logfile" tab.
@@ -71,7 +71,7 @@ Then call the script as follows in order to get the necessary cron jobs created:
 `wifi_schedule.sh cron`
 
 All commands:
- 
+
 ```
 wifi_schedule.sh cron|start|stop|forcestop|recheck|getmodules|savemodules|help