diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-02 03:06:51 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-02 03:06:51 +0100 |
| commit | 5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4 (patch) | |
| tree | 86cb32a5b72a214dbd7cf37ee7ae89b5c03de5be /prosody | |
| parent | 31116c6f6ccfa91b67c01b14408e6961cdfb6960 (diff) | |
| parent | 0516532553fea667f2f96145ed93eac85ee9135c (diff) | |
| download | prosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.tar.gz prosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -95,7 +95,7 @@ function read_config() print("\n"); print("**************************"); if level == "parser" then - print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":"); + print("A problem occurred while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":"); print(""); local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); if err:match("chunk has too many syntax levels$") then |