From 4ec9ddf5a8bf6ce6dcffe5c49f6d84ab5ca4c601 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 23 Apr 2013 22:54:21 +0200 Subject: Delete some athena words from files char_athena.conf to char-server.conf --- README.md | 2 +- README.txt | 2 +- conf/groups.conf | 2 +- conf/messages.conf | 2 +- doc/atcommands.txt | 2 +- doc/md5_hashcheck.txt | 2 +- src/char/char.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5b7aac287..0070c6300 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Examples: [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. [Notice]: Please edit your 'login' table to create a proper inter-server user/pa ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + [Notice]: and then edit your user/password in conf/map-server.conf (or conf/impo rt/map_conf.txt) Relax. This is just indicating that you're using the default username and password. To diff --git a/README.txt b/README.txt index 25ba050e9..d259744b5 100644 --- a/README.txt +++ b/README.txt @@ -117,7 +117,7 @@ Examples: [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. [Notice]: Please edit your 'login' table to create a proper inter-server user/pa ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + [Notice]: and then edit your user/password in conf/map_server.conf (or conf/impo rt/map_conf.txt) Relax. This is just indicating that you're using the default username and password. To 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. 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'. 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> ). diff --git a/doc/atcommands.txt b/doc/atcommands.txt index fae920300..b31fe4cef 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -9,7 +9,7 @@ //============================================================ This file describes the usage of in-game commands and assumes that -'conf/atcommand_athena.conf' has the following: +'conf/atcommand.conf' has the following: atcommand_symbol : "@" charcommand_symbol: "#" diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt index 10760a695..12681f367 100644 --- a/doc/md5_hashcheck.txt +++ b/doc/md5_hashcheck.txt @@ -17,7 +17,7 @@ server types, so a client diff is required to ensure the hash is sent. A link containing the required WeeDiffGen plugin can be found at: http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/ -The settings for the hash check are located in conf\login_athena.conf: +The settings for the hash check are located in conf\login.conf: // Client MD5 hash check // If turned on, the login server will check if the client's hash matches diff --git a/src/char/char.c b/src/char/char.c index b91a3a984..be98af10e 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4935,7 +4935,7 @@ int do_init(int argc, char **argv) if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); - ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n"); + ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n"); } inter_init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration -- cgit v1.2.3-60-g2f50