summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-24 10:47:20 -0300
committershennetsind <ind@henn.et>2013-04-24 10:47:20 -0300
commit7ef89df2da4b688fabe6362f13c2f1583dcdf60f (patch)
tree668b661a1eb79cdd6fe6c387d8422e19c60a889b /doc
parent9fbcd68feb07c638acd72192c3f3c9bc4fd52ad5 (diff)
parent9437541b47da33d4e6111d5f6e1edb89c1216d4d (diff)
downloadhercules-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 'doc')
-rw-r--r--doc/atcommands.txt2
-rw-r--r--doc/md5_hashcheck.txt2
2 files changed, 2 insertions, 2 deletions
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