some more comments and fixes in example config

diff --git a/server/server.cfg b/server/server.cfg
index faa62d83be53bf2cade04118d495626aba6cf763..b04429d8c4b537ac23a9c262331eb2f71dbb10a9 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -94,14 +94,14 @@
 //bot_suffix ""        // append this to all botnames
 //g_maplist_check_waypoints 0  // set this to 1 to skip maps without waypoints if there aren't enough players to play without bots
 
+// Map voting screen
 //g_maplist_votable
 //g_maplist_votable_suggestions
 //g_maplist_votable_abstain
 //g_maplist_votable_nodetail
 
+// Gametype voting screen (also includes an example of creating a custom gamemode)
 sv_vote_gametype 1 // uncommented because it's a suggested default
-
-// this also includes an example of creating a custom gamemode
 //sv_vote_gametype_options "dm tdm ca ctf 1v1ctf"
 // sv_vote_gametype_*_type Must be set to the name of the gametype the option is based on
 // sv_vote_gametype_*_name Contains a human-readable name of the gametype
@@ -112,6 +112,7 @@ sv_vote_gametype 1 // uncommented because it's a suggested default
 //alias sv_vote_gametype_hook_all "g_maxplayers 0"
 //alias sv_vote_gametype_hook_1v1ctf "g_maxplayers 2"
 
+// Votes available by 'vcall'
 //sv_vote_call
 //sv_vote_commands
 //sv_vote_majority_factor
@@ -128,6 +129,7 @@ sv_vote_gametype 1 // uncommented because it's a suggested default
 //rcon_restricted_commands
 //rcon_restricted_password
 
+// Autokick idle players (conditionally only if there are enough free slots)
 //sv_maxidle
 
 //sv_taunt
@@ -186,11 +188,13 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 /////////////////////////////////////////////////////////////////////
 // Some more advanced settings.  You probably are not interested in changing them at all.
 
+// Allow restarting the current match using the "ready" button
 //sv_ready_restart
 //sv_ready_restart_after_countdown
 //sv_ready_restart_repeatable
 //sv_autoscreenshot 0  // Useful for competitions or the ladder.
 
+// Different hit detection options
 //g_antilag
 
 //sv_maxrate 1000000   // limits client connections to this rate in bytes/seconds
@@ -198,6 +202,7 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 // see Docs/mapdownload.txt for more info
 //sv_curl_defaulturl
 
+// Force player models for everyone
 //sv_defaultcharacter
 //sv_defaultplayermodel
 //sv_defaultplayerskin
@@ -205,6 +210,7 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 //g_fullbrightplayers
 //g_fullbrightitems
 
+// Gives players the freedom to make better teams than automatic but makes abuse easier
 //g_balance_teams
 //g_balance_teams_prevent_imbalance
 
@@ -218,16 +224,20 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 
 /////////////////////////////////////////////////////////////////////
 // "Obvious" mutators that are allowed on a "pure" server
+// Note that they often have more config options, use 'apropos'
 
 //g_instagib
 //g_weapon_stay
 //g_powerups
+//g_jetpack
+//g_grappling_hook
+//g_nix
 
 
 
 
 /////////////////////////////////////////////////////////////////////
-// Overkill mod settings
+// Overkill ruleset
 
 // To enable Overkill, put 'exec ruleset-overkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
 
@@ -236,17 +246,9 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 
 /////////////////////////////////////////////////////////////////////
 // WARNING: anything below this line makes your server "impure"!
-
-// some mutators (and other cvars) you might find interesting
+// Some more mutators (and other cvars) you might find interesting
 
 //g_cloaked
-//g_grappling_hook
-//g_jetpack
 //g_midair
 //g_vampire
 //sv_gravity
-
-//g_nix
-//g_nix_with_healtharmor
-//g_nix_with_blaster
-//g_nix_with_powerups