summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStreusel <m.me1@live.de>2013-04-23 23:57:10 -0700
committerStreusel <m.me1@live.de>2013-04-23 23:57:10 -0700
commit17115a267014674e85aecdbd20f12dc495a6cbe6 (patch)
tree20ef99e00f7148625bf76c8aa2d24e10e72b5d59 /conf
parent8c3c4577bde31ccee677ea75649b89cfa5822240 (diff)
parent4ec9ddf5a8bf6ce6dcffe5c49f6d84ab5ca4c601 (diff)
downloadhercules-17115a267014674e85aecdbd20f12dc495a6cbe6.tar.gz
hercules-17115a267014674e85aecdbd20f12dc495a6cbe6.tar.bz2
hercules-17115a267014674e85aecdbd20f12dc495a6cbe6.tar.xz
hercules-17115a267014674e85aecdbd20f12dc495a6cbe6.zip
Merge pull request #22 from txandy/master
Delete some athena words from some files.
Diffstat (limited to 'conf')
-rw-r--r--conf/groups.conf2
-rw-r--r--conf/messages.conf2
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>).