diff options
| author | shennetsind <ind@henn.et> | 2013-04-24 10:47:20 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-04-24 10:47:20 -0300 |
| commit | 7ef89df2da4b688fabe6362f13c2f1583dcdf60f (patch) | |
| tree | 668b661a1eb79cdd6fe6c387d8422e19c60a889b /conf | |
| parent | 9fbcd68feb07c638acd72192c3f3c9bc4fd52ad5 (diff) | |
| parent | 9437541b47da33d4e6111d5f6e1edb89c1216d4d (diff) | |
| download | hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.gz hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.bz2 hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.tar.xz hercules-7ef89df2da4b688fabe6362f13c2f1583dcdf60f.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/groups.conf | 2 | ||||
| -rw-r--r-- | conf/messages.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/groups.conf b/conf/groups.conf index 879361387..d3bd6a514 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -41,7 +41,7 @@ Command names must not be aliases. <log_commands> Boolean value. If true then all commands used by the group will be logged to atcommandlog. If setting is omitted in a group definition, false is assumed. -Requires 'log_commands' to be enabled in 'conf/log_athena.conf'. +Requires 'log_commands' to be enabled in 'conf/logs.conf'. <permissions> A group of settings diff --git a/conf/messages.conf b/conf/messages.conf index 823a6eb65..79e33c885 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -833,7 +833,7 @@ // @reloadatcommand 1036: Error reading groups.conf, reload failed. -1037: Error reading atcommand_athena.conf, reload failed. +1037: Error reading atcommand.conf, reload failed. // @mapinfo 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>). |