From: Jakub Ružička Date: Fri, 4 Dec 2020 17:05:44 +0000 (+0100) Subject: typo: fix occured -> occurred X-Git-Tag: v5.2.1~5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2223ad943b87b779184b5ba59ac1b5bf434f2b4f;p=thirdparty%2Fknot-resolver.git typo: fix occured -> occurred In English, the final letter is doubled when a word of two or more syllables has stress on the final syllable so a correct form is "occurred". --- diff --git a/daemon/bindings/impl.c b/daemon/bindings/impl.c index d9ad0774f..26b5222d9 100644 --- a/daemon/bindings/impl.c +++ b/daemon/bindings/impl.c @@ -76,7 +76,7 @@ void kr_bindings_register(lua_State *L) void lua_error_p(lua_State *L, const char *fmt, ...) { /* Add a stack trace and throw the result as a lua error. */ - luaL_traceback(L, L, "error occured here (config filename:lineno is at the bottom, if config is involved):", 0); + luaL_traceback(L, L, "error occurred here (config filename:lineno is at the bottom, if config is involved):", 0); /* Push formatted custom message, prepended with "ERROR: ". */ lua_pushliteral(L, "\nERROR: "); { diff --git a/daemon/lua/sandbox.lua.in b/daemon/lua/sandbox.lua.in index d9d1bc05b..993f36d5e 100644 --- a/daemon/lua/sandbox.lua.in +++ b/daemon/lua/sandbox.lua.in @@ -19,7 +19,7 @@ day = 24 * hour -- Logging function panic(fmt, ...) - print(debug.traceback('error occured here (config filename:lineno is ' + print(debug.traceback('error occurred here (config filename:lineno is ' .. 'at the bottom, if config is involved):', 2)) error(string.format('ERROR: '.. fmt, ...), 0) end diff --git a/daemon/scripting.rst b/daemon/scripting.rst index 48b4da139..629855c0a 100644 --- a/daemon/scripting.rst +++ b/daemon/scripting.rst @@ -124,7 +124,7 @@ process for liveliness by connecting to the UNIX socket. }, { false, -- function failed - 'error occured...', -- the returned error message + 'error occurred...', -- the returned error message ['n'] = 2, }, ['n'] = 2,