Merge branch 'DefaultUser/serverCFG_sv_vote_gametype' into 'master'

[xonotic/xonotic.git] / Docs / mapping.txt

diff --git a/Docs/mapping.txt b/Docs/mapping.txt
index 98dac9a0cdaebdd0c7bd8cfe0fc8e95b7d66a4a1..6a0c01ed074f75ecbbf22c7a301917878600681b 100644 (file)
--- a/Docs/mapping.txt
+++ b/Docs/mapping.txt
@@ -8,10 +8,8 @@ there's much more available.
 \r
 Table of Contents\r
 -----------------\r
-I        Map Lists & Scripts\r
+I        Map Settings\r
          (get your map listed and working)\r
-  i.     mapinfo\r
-  ii.    mapname.cfg\r
 \r
 II       Map Image\r
 \r
@@ -31,24 +29,14 @@ Appendix B - Helpful extras
 \r
 Appendix C - Advanced Darkplaces shaders\r
 \r
-========================\r
-=I. Map Lists & Scripts=\r
-========================\r
+=================\r
+=I. Map Settings=\r
+=================\r
 \r
-There now is just a single script/cfg file available to you, containing all map\r
-specific settings:\r
+All map specific settings goes in a single file:\r
 \r
 mapname.mapinfo\r
 \r
-The mapinfo is actually required - however, the game is so nice that it\r
-automatically generates a draft of it for you.\r
-\r
-------------------\r
--The mapinfo file-\r
-------------------\r
-\r
-*cue even more scary music*\r
-\r
 The mapinfo file is basically what gets your map listed in the menu, and sets\r
 up the options needed to change to it. If no mapinfo file exists, the menu\r
 will automatically generate a rough draft for you on game startup. It will get\r
@@ -97,7 +85,7 @@ the right game modes and with the right description in the menu.
 \r
 Also, note the "has weapons" line. If this line is not there (which happens if\r
 the map contains no weapon entities other than the Nex), the map will run in\r
-MinstaGib only and not be shown in the menu normally. So if you look for your\r
+InstaGib only and not be shown in the menu normally. So if you look for your\r
 map and don't find it, add "has weapons" to the mapinfo file, and make sure you\r
 have weapon entities placed.\r
 \r