aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-06-30 00:36:03 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-06-30 00:36:03 +0200
commit676c7341d69bc93e95f147608635655fd91c79b9 (patch)
tree934a1bae2a8c791aad0bde4fe4acd04ecc7e2bf4 /README
parent83066a200202d7a487d11389e73173c1db0c391e (diff)
parent718fc5bfc94bdfa8c94a5ed646f31305ab2b08bd (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
Diffstat (limited to 'README')
-rw-r--r--README10
1 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index cd3e2dc108b..294f3149451 100644
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ You need to run sql/create/create_mysql.sql 1st and then
sql/base/auth_database.sql and sql/base/characters_database.sql
You need to download world database from http://www.trinitycore.org/f/files/
be sure you get the higher numbered database.
-When installing a core the 1st time you need to import also the files at
+When installing a core the 1st time you need to import also all the files at
sql/updates/world directory.
sql/updates/auth and sql/updates/characters databases only needs to be run
when updating one existing server.
@@ -56,9 +56,9 @@ under Windows or cat *.sql > world_updates under Linux.
You need to update your core (recompile and overwrite binaries) when updating
your database, usually you can't use one older core with a newer database or a
-newer core with a older database.
+newer core with an older database.
When updating your core you also need to import the files at sql/updates/auth
-and sql/updates/characters along with sql/updates/world files.
+and sql/updates/characters along with the sql/updates/world files.
You can't merge all the sql files on sql/updates into a single file, because
they belong to 3 different databases and they don't use database name.
@@ -67,7 +67,7 @@ Platform: Linux, Windows or Mac
Processor with SSE2 support
ACE ≥ 5.8.3
MySQL ≥ 5.1.0
-CMake ≥ 2.8.0 (max 2.8.9 under linux)
+CMake ≥ 2.8.0
OpenSSL ≥ 0.9.8o
GCC ≥ 4.3 (Linux only)
MS Visual Studio ≥ 9 (2008) (Windows only)
@@ -76,5 +76,5 @@ if wiki refers to TDB 50 and you see TDB 52 get the higher number.
Some reading skills, search forum, read http://www.trinitycore.org/f/topic/1518-
and http://www.trinitycore.org/f/topic/37- before posting a bug report or ask for
help on forum.
-Search for existing bug reports before post your bug report, don't post multiple
+Search for existing bug reports before posting your own bug reports; don't post multiple
bugs on a single ticket.