Permalink
Browse files

Updated Merging doc

  • Loading branch information...
1 parent c80b80c commit c40d16c9f8eaf15ce77ad7fa8c3d280d07032782 @Easelm Easelm committed Aug 28, 2015
Showing with 4 additions and 1 deletion.
  1. +4 −1 docs/MERGING.md
View
@@ -1,12 +1,15 @@
#Merging Eluna
Eluna can be added to various sources by applying the core changes required for Eluna to function.
Below you find the guides for merging Eluna with each core or a fork of it.
-If you choose to merge you should be able to maintain and update yourself - we do not maintain your core.
+If you choose to merge you should be able to maintain and update yourself - we do not maintain your core. View Unofficial Merging below.
We also do not fix any merging errors you may have, but you are free to ask about them on the [support forum](../README.md#documentation) and we may assist.
We recommend using the [installation guide](INSTALL.md) especially if you are not familiar with git and updating the code.
It allows you to simply use `git pull` followed by `git submodule update` to update your source and we will handle the merging and maintenance with the official core source. Naturally you still need to handle updating the database as instructed by the core's wiki or instructions.
+###Unofficial Merging
+We do not support unofficial merging. View [Unofficial Merging](http://emudevs.com/showthread.php/5000) thread.
+
###Merging Eluna with MaNGOS
Eluna is merged with [official MaNGOS](http://getmangos.eu/) by default.

0 comments on commit c40d16c

Please sign in to comment.