Merge branch 'master' of https://github.com/codeoverflow-org/chatoverflow-wiki into english_fix

Author: DragonCoder01

development/Deploy-ChatOverflow.md

@@ -1,10 +1,6 @@
-# Deprecated, will be updated soonTM
-
 To deploy Chat Overflow and create runnable jar files, follow these steps:
 
-1. Execute `sbt dependencyList` to get a dependency list of the current framework version on the console
-2. Copy the output into the `dependencyList.txt`-file. Only copy the lines with dependency information (see commited example)
-3. Execute the run configuration `[Deploy] Generate Bootstrap Launcher and deploy`. This updates the `dependencies.xml`-file in the bootstrap-project, bundles everything and copies it to the `deploy`-folder. Magic.
-4. Navigate to the `deploy`-folder and run the bootstrap launcher with `java -jar ChatOverflow.jar`. After downloading all libraries, a standalone version of Chat Overflow should be started.
+1. Execute the IntelliJ run configuration `[Deploy] Generate Bootstrap Launcher and deploy` or run the make target with `make bootstrap_deploy`. This updates the `dependencies.xml`-file in the bootstrap-project with the current dependencies, bundles everything and copies it along with start scripts, the license and a readme to the `deploy`-folder. Magic.
+2. Navigate to the `deploy`-folder and run the bootstrap launcher with `java -jar ChatOverflow.jar`. After downloading all libraries, a standalone version of Chat Overflow should be started.
 
-A release of chat overflow is simply the deploy folder, without configs or libraries. Don't forget to update Chat Overflow Framework and API Version before a public release.
+A release of chat overflow is simply a zip archive of the deploy folder, without configs or libraries. Don't forget to update Chat Overflow Framework and API Version before a public release.