diff --git a/src/warden-server/etc/warden-server.conf b/src/warden-server/etc/warden-server.conf
index 7e974d17deef610636058354474d1e0b3deb2371..1ac4fcecee6ee116ccc6beb983da2dbec97cad9f 100644
--- a/src/warden-server/etc/warden-server.conf
+++ b/src/warden-server/etc/warden-server.conf
@@ -13,38 +13,38 @@ $BASEDIR = '/opt/warden-server';
 $SYSLOG	= 1;
 
 #-------------------------------------------------------------------------------
-# SYSLOG - enable/disable syslog logging in verbose mode (with stack information)
+# SYSLOG_VERBOSE - enable/disable logging in verbose mode (stack info added)
 #-------------------------------------------------------------------------------
 $SYSLOG_VERBOSE = 1;
 
 #-------------------------------------------------------------------------------
-# SYSLOG - syslog facility
+# SYSLOG_FACILITY - syslog facility
 #-------------------------------------------------------------------------------
 $SYSLOG_FACILITY = 'local7';
 
 #-------------------------------------------------------------------------------
-# DB_NAME - database name of Warden server
+# DB_NAME - MySQL database name of Warden server
 #-------------------------------------------------------------------------------
 $DB_NAME = 'warden';
 
 #-------------------------------------------------------------------------------
-# DB_USER - user of Warden server database
+# DB_USER - MySQL database user of Warden server
 #-------------------------------------------------------------------------------
 $DB_USER = 'root';
 
 #-------------------------------------------------------------------------------
-# DB_PASS - password of Warden server database
+# DB_PASS - MySQL database password of Warden server
 #-------------------------------------------------------------------------------
 $DB_PASS = '';
 
 #-------------------------------------------------------------------------------
-# DB_HOST - what IP address to listen on of Warden server
+# DB_HOST - MySQL database host
 #-------------------------------------------------------------------------------
 $DB_HOST = 'localhost';
 
 #-------------------------------------------------------------------------------
-# MAX_EVENTS_LIMIT - maximum number of events that can be downloaded from
-# 		    Warden server in a single getNewEvents client function call
+# MAX_EVENTS_LIMIT - server limit of maximum number of events that can be
+#                    delivered to one client in one batch
 #-------------------------------------------------------------------------------
 $MAX_EVENTS_LIMIT = '1000000';
 
@@ -52,6 +52,6 @@ $MAX_EVENTS_LIMIT = '1000000';
 # VALID_STRINGS - validation hash containing allowed event attributes
 #-------------------------------------------------------------------------------
 %VALID_STRINGS = (
-	'type'		=> ['portscan', 'bruteforce', 'probe', 'spam', 'phishing', 'botnet_c_c', 'dos', 'malware', 'copyright', 'webattack', 'test', 'other'],
-	'source_type'	=> ['IP', 'URL', 'Reply-To:']
+  'type'	=> ['portscan', 'bruteforce', 'probe', 'spam', 'phishing', 'botnet_c_c', 'dos', 'malware', 'copyright', 'webattack', 'test', 'other'],
+  'source_type'	=> ['IP', 'URL', 'Reply-To:']
 );