Merge branch 'martin-t/server.cfg' into 'master'

Mention apropos and cacs in server.cfg

See merge request !20

diff --combined server/server.cfg
index 344ba746f890bb90f7c69667380057d9c315a058,3bcbdd637a489bb34d7e4d61be1b3f330455e7b5..54ddb7a46042a6f75dc4d64a5cb024a274310cbc
--- 1/server/server.cfg
--- 2/server/server.cfg
+++ b/server/server.cfg
@@@ -3,6 -3,10 +3,10 @@@
  // with // (begins a comment for the rest of the line or next
  // semicolon).  While just "" means 'no/empty setting'.
  
+ // You can search for settings and read their descriptions using
+ // the 'search' command in console. A list of cvars and commands in the latest
+ // release is also available online here: http://www.xonotic.org/tools/cacs/
+ 
  /////////////////////////////////////////////////////////////////////
  // Everything has some sensible defaults so you do NOT really need to
  // change anything.  But here are some settings you SHOULD change to
@@@ -164,7 -168,7 +168,7 @@@ sv_weaponstats_file http://www.xonotic.
  //sv_curl_defaulturl http://www.xonotic.com/contentdownload/getmap.php?file=  //fallback download URL
  
  //sv_defaultcharacter 0       // 1 will force a specific model for all players
 -//sv_defaultplayermodel models/player/nexus.zym       // this model will be used
 +//sv_defaultplayermodel models/player/erebus.iqm      // this model will be used
  //sv_defaultplayerskin 0      // this skin number will be forced for all players
  //sv_defaultplayercolors ""   // you can even force player colors here (16*shirt+pants)
  //g_fullbrightplayers 0       // 1 to make players fullbright