From 401382a459743db941738a645822b443ecfdc596 Mon Sep 17 00:00:00 2001 From: yangfl Date: Sat, 18 Aug 2018 12:21:21 +0800 Subject: [PATCH] treewide: Fix typos in comments Signed-off-by: David Yang --- .../luci-app-asterisk/luasrc/asterisk.lua | 10 +++++----- .../luasrc/view/asterisk/dialzones.htm | 2 +- .../luasrc/model/cbi/ddns/detail.lua | 6 +++--- .../htdocs/luci-static/resources/olsr-viz.js | 2 +- .../luasrc/model/cbi/privoxy.lua | 6 +++--- .../luasrc/model/cbi/siitwizard.lua | 2 +- .../luasrc/view/splash/splash.htm | 2 +- .../root/etc/init.d/luci_splash | 4 ++-- .../luci_statistics/luci_statistics.lua | 2 +- .../rrdtool/definitions/interface.lua | 2 +- .../statistics/rrdtool/definitions/netlink.lua | 2 +- .../luasrc/model/cbi/unbound/zones.lua | 6 +++--- applications/luci-app-wifischedule/README.md | 10 +++++----- build/check-controllers.sh | 2 +- build/i18n-scan.pl | 2 +- build/luadoc/luadoc/config.lua | 2 +- .../files/usr/bin/meshwizard/functions.sh | 2 +- documentation/CBI.md | 4 ++-- documentation/Templates.md | 2 +- .../luasrc/http/mime.luadoc | 2 +- libs/luci-lib-ip/src/ip.luadoc | 18 +++++++++--------- libs/luci-lib-nixio/docsrc/CHANGELOG.lua | 2 +- libs/luci-lib-nixio/docsrc/README.lua | 2 +- libs/luci-lib-nixio/docsrc/nixio.lua | 2 +- libs/luci-lib-px5g/src/library/bignum.c | 8 ++++---- libs/luci-lib-px5g/src/library/x509write.c | 8 ++++---- libs/luci-lib-px5g/src/polarssl/bignum.h | 6 +++--- libs/luci-lib-px5g/src/polarssl/x509.h | 6 +++--- modules/luci-base/luasrc/dispatcher.luadoc | 2 +- modules/luci-base/luasrc/http.lua | 4 ++-- modules/luci-base/luasrc/http.luadoc | 4 ++-- modules/luci-base/luasrc/model/uci.lua | 2 +- modules/luci-base/luasrc/model/uci.luadoc | 6 +++--- modules/luci-base/luasrc/sys.luadoc | 8 ++++---- modules/luci-base/luasrc/util.lua | 2 +- modules/luci-base/luasrc/util.luadoc | 4 ++-- modules/luci-base/src/template_utils.c | 2 +- .../luasrc/model/cbi/admin_system/system.lua | 2 +- 38 files changed, 80 insertions(+), 80 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 @@

Create a new dialzone

The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .
- You can specifiy multiple number matches by separating them with spaces.
+ You can specify multiple number matches by separating them with spaces.
<%- if create_error then %>
Invalid name given!
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:%>

  • <%:use filesharing applications on this network%>
    • -
  • <%:waste bandwidth with unneccesary downloads or streams%>
    • +
  • <%:waste bandwidth with unnecessary downloads or streams%>
  • <%:perform any kind of illegal activities%>

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 .so where is derived from the called path + -- override entry(): check for existence .so where 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 diff --git a/build/check-controllers.sh b/build/check-controllers.sh index 573e6f8642..47f66eac94 100755 --- a/build/check-controllers.sh +++ b/build/check-controllers.sh @@ -14,7 +14,7 @@ find . -type f -name '*.lua' -path '*/controller/*' | while read controller; do package="${controller##*/controller/}"; package="${package%.lua}"; package="luci.controller.${package//\//.}" if ! grep -sqE '\bmodule[[:space:]]*\(?[[:space:]]*("|\047|\[=*\[)'"$package" "$controller"; then - echo "'$controller' does not containt the expected\n\t'module(\"$package\", ...)' line.\n" + echo "'$controller' does not contain the expected\n\t'module(\"$package\", ...)' line.\n" fi grep -sqE '\b(Form|SimpleForm)[[:space:]]*\(' "$model" && ! grep -sqE '\bMap[[:space:]]*\(' "$model" && is_form=1 || is_form=0 diff --git a/build/i18n-scan.pl b/build/i18n-scan.pl index 899d90d22c..3f9ee89630 100755 --- a/build/i18n-scan.pl +++ b/build/i18n-scan.pl @@ -4,7 +4,7 @@ use strict; use warnings; use Text::Balanced qw(extract_bracketed extract_delimited extract_tagged); -@ARGV >= 1 || die "Usage: $0 \n"; +@ARGV >= 1 || die "Usage: $0 \n"; my %stringtable; diff --git a/build/luadoc/luadoc/config.lua b/build/luadoc/luadoc/config.lua index 9e4b9de3c5..319e1cb03e 100644 --- a/build/luadoc/luadoc/config.lua +++ b/build/luadoc/luadoc/config.lua @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- -- LuaDoc configuration file. This file contains the default options for --- luadoc operation. These options can be overriden by the command line tool +-- luadoc operation. These options can be overridden by the command line tool -- @see luadoc.print_help -- @release $Id: config.lua,v 1.6 2007/04/18 14:28:39 tomas Exp $ ------------------------------------------------------------------------------- diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh index b0f6cb291e..0b99530a57 100644 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh @@ -46,7 +46,7 @@ set_defaults() { b="${b//_/ }" string_contains "$a" "_LENGTH" && continue string_contains "$a" "_ITEM" && { - # special threatment for lists. use add_list and remove the + # special treatment for lists. use add_list and remove the # item index (_ITEMx). uci add_list $2.${a//_ITEM[0-9]*/}="$b" } || { diff --git a/documentation/CBI.md b/documentation/CBI.md index e937fe6048..d4bc4c34e5 100644 --- a/documentation/CBI.md +++ b/documentation/CBI.md @@ -131,7 +131,7 @@ If you call this function several times the dependencies will be linked with **" Adds an entry to the selection list #### property .widget = "select" -**"select"** shows a selction list, **"radio"** shows a list of radio buttons inside form +**"select"** shows a selection list, **"radio"** shows a list of radio buttons inside form #### property .default = nil The default value @@ -194,7 +194,7 @@ If you call this function several times the dependencies will be linked with **" Adds an entry to the list #### property .widget = "checkbox" -**"select"** shows a selction list, **"checkbox"** shows a list of checkboxes inside form +**"select"** shows a selection list, **"checkbox"** shows a list of checkboxes inside form #### property .delimiter = " " The string which will be used to delimit the values inside stored option diff --git a/documentation/Templates.md b/documentation/Templates.md index dc42c28ab7..adf019c01a 100644 --- a/documentation/Templates.md +++ b/documentation/Templates.md @@ -1,7 +1,7 @@ LuCI has a simple regex based template processor which parses HTML-files to Lua functions and allows to store precompiled template files. The simplest form of a template is just an ordinary HTML-file. It will be printed out to the user as is. -In LuCI every template is an object with an own scope. It can therefore be instanciated and each instance can has a different scope. As every template processor. LuCI supports several special markups. Those are enclosed in `<% %>`-Tags. +In LuCI every template is an object with an own scope. It can therefore be instantiated and each instance can has a different scope. As every template processor. LuCI supports several special markups. Those are enclosed in `<% %>`-Tags. By adding `-` (dash) right after the opening `<%` every whitespace before the markup will be stripped. Adding a `-` right before the closing `%>` will equivalently strip every whitespace behind the markup. diff --git a/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc b/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc index 7751e2baf4..9c7f01aedf 100644 --- a/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc +++ b/libs/luci-lib-httpprotoutils/luasrc/http/mime.luadoc @@ -7,7 +7,7 @@ vice versa. module "luci.http.mime" ---[[ -MIME mapping table containg extension - mimetype relations. +MIME mapping table containing extension - mimetype relations. @class table ]] diff --git a/libs/luci-lib-ip/src/ip.luadoc b/libs/luci-lib-ip/src/ip.luadoc index b1ecae1453..a2df96cdb5 100644 --- a/libs/luci-lib-ip/src/ip.luadoc +++ b/libs/luci-lib-ip/src/ip.luadoc @@ -283,7 +283,7 @@ Fetch all routes, optionally matching the given criteria. @sort 9 @name routes @param filter

Table containing one or more of the possible filter -critera described below (optional)

+criteria described below (optional)

FieldDescription
`family` Number describing the address family to return - `4` selects @@ -363,7 +363,7 @@ Fetches entries from the IPv4 ARP and IPv6 neighbour kernel table @sort 10 @name neighbors @param filter

Table containing one or more of the possible filter -critera described below (optional)

+criteria described below (optional)

FieldDescription
`family` Number describing the address family to return - `4` selects @@ -652,7 +652,7 @@ are considered lower than MAC addresses @class function @sort 10 @name cidr.lower -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is lower than the given address, else `false`. @@ -676,7 +676,7 @@ are considered lower than MAC addresses @class function @sort 11 @name cidr.higher -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is higher than the given address, else `false`. @@ -696,7 +696,7 @@ Checks whether this CIDR instance is equal to the given argument. @class function @sort 12 @name cidr.equal -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to compare against. @return `true` if this CIDR is equal to the given address, else `false`. @@ -877,7 +877,7 @@ Test whether CIDR contains given range. @class function @sort 21 @name cidr.contains -@param addr A `luci.ip.cidr` instance or a string convertable by +@param addr A `luci.ip.cidr` instance or a string convertible by `luci.ip.new()` to test. @return `true` if this instance fully contains the given address else `false`. @@ -903,12 +903,12 @@ address space, the result is set to the highest possible address. @sort 22 @name cidr.add @param amount A numeric value between 0 and 0xFFFFFFFF, a - `luci.ip.cidr` instance or a string convertable by + `luci.ip.cidr` instance or a string convertible by `luci.ip.new()`. @param inplace If `true`, modify this instance instead of returning a new derived CIDR instance. @return
    -
  • When adding inplace: Return `true` if the addition succeded +
  • When adding inplace: Return `true` if the addition succeeded or `false` when the addition overflowed.
  • When deriving new CIDR: Return new instance representing the value of this instance plus the added amount or the highest possible address if @@ -952,7 +952,7 @@ possible address is returned. @sort 23 @name cidr.sub @param amount A numeric value between 0 and 0xFFFFFFFF, a - `luci.ip.cidr` instance or a string convertable by + `luci.ip.cidr` instance or a string convertible by `luci.ip.new()`. @param inplace If `true`, modify this instance instead of returning a new derived CIDR instance. diff --git a/libs/luci-lib-nixio/docsrc/CHANGELOG.lua b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua index aa31841402..8c9260317b 100644 --- a/libs/luci-lib-nixio/docsrc/CHANGELOG.lua +++ b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua @@ -10,7 +10,7 @@ module "nixio.CHANGELOG" --
  • Added support for x509 certificates in DER format.
    • --
  • Added support for splice() in UnifiedIO.copyz().
    • --
  • Added interface to inject chunks into UnifiedIO.linesource() buffer.
    • ---
  • Changed TLS behaviour to explicitely separate servers and clients.
    • +--
  • Changed TLS behaviour to explicitly separate servers and clients.
    • --
  • Fixed usage of signed datatype breaking Base64 decoding.
    • --
  • Fixed namespace clashes for nixio.fs.
    • --
  • Fixed splice() support for some exotic C libraries.
    • diff --git a/libs/luci-lib-nixio/docsrc/README.lua b/libs/luci-lib-nixio/docsrc/README.lua index 9860cf0919..d663b629ee 100644 --- a/libs/luci-lib-nixio/docsrc/README.lua +++ b/libs/luci-lib-nixio/docsrc/README.lua @@ -18,7 +18,7 @@ module "nixio.README" -- table nixio.const_sock for socket error codes. This might -- be important if you are dealing with Windows applications, on POSIX however -- const_sock is just an alias for const. ---
  • With some exceptions - which are explicitely stated in the function +--
  • With some exceptions - which are explicitly stated in the function -- documentation - all blocking functions are signal-protected and will not fail -- with EINTR.
    • --
  • On POSIX the SIGPIPE signal will be set to ignore upon initialization. diff --git a/libs/luci-lib-nixio/docsrc/nixio.lua b/libs/luci-lib-nixio/docsrc/nixio.lua index 1a0d69a054..56a4afbb88 100644 --- a/libs/luci-lib-nixio/docsrc/nixio.lua +++ b/libs/luci-lib-nixio/docsrc/nixio.lua @@ -59,7 +59,7 @@ module "nixio" --
  • aliases = Table of alias names
    • --
---- Get all or a specifc proto entry. +--- Get all or a specific proto entry. -- @class function -- @name nixio.getproto -- @param proto protocol number or name to lookup (optional) diff --git a/libs/luci-lib-px5g/src/library/bignum.c b/libs/luci-lib-px5g/src/library/bignum.c index 8b7c12ff00..d2a8ff42e1 100644 --- a/libs/luci-lib-px5g/src/library/bignum.c +++ b/libs/luci-lib-px5g/src/library/bignum.c @@ -720,7 +720,7 @@ cleanup: } /* - * Helper for mpi substraction + * Helper for mpi subtraction */ static void mpi_sub_hlp( int n, t_int *s, t_int *d ) { @@ -741,7 +741,7 @@ static void mpi_sub_hlp( int n, t_int *s, t_int *d ) } /* - * Unsigned substraction: X = |A| - |B| (HAC 14.9) + * Unsigned subtraction: X = |A| - |B| (HAC 14.9) */ int mpi_sub_abs( mpi *X, mpi *A, mpi *B ) { @@ -809,7 +809,7 @@ cleanup: } /* - * Signed substraction: X = A - B + * Signed subtraction: X = A - B */ int mpi_sub_mpi( mpi *X, mpi *A, mpi *B ) { @@ -856,7 +856,7 @@ int mpi_add_int( mpi *X, mpi *A, int b ) } /* - * Signed substraction: X = A - b + * Signed subtraction: X = A - b */ int mpi_sub_int( mpi *X, mpi *A, int b ) { diff --git a/libs/luci-lib-px5g/src/library/x509write.c b/libs/luci-lib-px5g/src/library/x509write.c index 173610c1a0..b9ebf35bae 100644 --- a/libs/luci-lib-px5g/src/library/x509write.c +++ b/libs/luci-lib-px5g/src/library/x509write.c @@ -19,7 +19,7 @@ * MA 02110-1301 USA */ /* - * The ITU-T X.509 standard defines a certificat format for PKI. + * The ITU-T X.509 standard defines a certificate format for PKI. * * http://www.ietf.org/rfc/rfc2459.txt * http://www.ietf.org/rfc/rfc3279.txt @@ -68,7 +68,7 @@ static int asn1_eval_octet(unsigned int digit) } /* - * write the asn.1 lenght form into p + * write the asn.1 length form into p */ static int asn1_add_len(unsigned int size, x509_node *node) { @@ -788,7 +788,7 @@ static int x509write_parse_names(x509_node *node, unsigned char *names) R_len = len; } - /* set tag poiner to begin */ + /* set tag pointer to begin */ tag_sp = tag; /* is at end? */ @@ -866,7 +866,7 @@ static int x509write_parse_names(x509_node *node, unsigned char *names) } /* - * Copy raw data from orginal ca to node + * Copy raw data from original ca to node */ static int x509write_copy_from_raw(x509_node *node, x509_buf *raw) { diff --git a/libs/luci-lib-px5g/src/polarssl/bignum.h b/libs/luci-lib-px5g/src/polarssl/bignum.h index c667303329..cf443ea922 100644 --- a/libs/luci-lib-px5g/src/polarssl/bignum.h +++ b/libs/luci-lib-px5g/src/polarssl/bignum.h @@ -272,7 +272,7 @@ int mpi_cmp_int( mpi *X, int z ); int mpi_add_abs( mpi *X, mpi *A, mpi *B ); /** - * \brief Unsigned substraction: X = |A| - |B| + * \brief Unsigned subtraction: X = |A| - |B| * * \return 0 if successful, * POLARSSL_ERR_MPI_NEGATIVE_VALUE if B is greater than A @@ -288,7 +288,7 @@ int mpi_sub_abs( mpi *X, mpi *A, mpi *B ); int mpi_add_mpi( mpi *X, mpi *A, mpi *B ); /** - * \brief Signed substraction: X = A - B + * \brief Signed subtraction: X = A - B * * \return 0 if successful, * 1 if memory allocation failed @@ -304,7 +304,7 @@ int mpi_sub_mpi( mpi *X, mpi *A, mpi *B ); int mpi_add_int( mpi *X, mpi *A, int b ); /** - * \brief Signed substraction: X = A - b + * \brief Signed subtraction: X = A - b * * \return 0 if successful, * 1 if memory allocation failed diff --git a/libs/luci-lib-px5g/src/polarssl/x509.h b/libs/luci-lib-px5g/src/polarssl/x509.h index 908a1dbf51..6c9ef99a8a 100644 --- a/libs/luci-lib-px5g/src/polarssl/x509.h +++ b/libs/luci-lib-px5g/src/polarssl/x509.h @@ -375,7 +375,7 @@ int x509write_add_pubkey( x509_raw *chain, rsa_context *pubkey ); * the string parse. * * \param chain points to the raw certificate data - * \param names a string that can hold (separete with ";"): + * \param names a string that can hold (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit @@ -402,7 +402,7 @@ int x509write_add_customize ( x509_raw *crt, * \brief Add x509 issuer field * * \param chain points to the raw certificate data -* \param issuer a string holding (separete with ";"): +* \param issuer a string holding (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit @@ -419,7 +419,7 @@ int x509write_add_issuer( x509_raw *crt, unsigned char *issuer); * \brief Add x509 subject field * * \param chain points to the raw certificate data - * \param subject a string holding (separete with ";"): + * \param subject a string holding (separate with ";"): * CN=CommonName * -- O=Organization * -- OU=OrgUnit diff --git a/modules/luci-base/luasrc/dispatcher.luadoc b/modules/luci-base/luasrc/dispatcher.luadoc index ddf534b3e1..f26256953a 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 f4ede4b8a5..20b55f2854 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 f8121230b6..8f6f380d8b 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 2119a210bb..a50e28a871 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 d798b00338..0189d49aa1 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 1c1fa92602..3c7f69c6e9 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 f16b3afb2e..1a329f3f20 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 c4f28d039a..4ec68dd1ef 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 3979487f12..0411932ce9 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; } diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua index a68c439141..7558d42161 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua @@ -130,7 +130,7 @@ end -- --- Langauge & Style +-- Language & Style -- o = s:taboption("language", ListValue, "_lang", translate("Language")) -- 2.30.2