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

Mention apropos and cacs in server.cfg

See merge request !20

diff --git a/server/server.cfg b/server/server.cfg
index 344ba746f890bb90f7c69667380057d9c315a058..54ddb7a46042a6f75dc4d64a5cb024a274310cbc 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -3,6 +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