diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -128,7 +128,7 @@ full_stack = true
 ## return gzipped responses from Rhodecode (static files/application)
 gzip_responses = true
 
-# autogenerate javascript routes file on startup
+## autogenerate javascript routes file on startup
 generate_js_files = false
 
 ## Optional Languages
@@ -317,8 +317,8 @@ beaker.cache.sql_cache_short.type = memo
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-# default is memory cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memory cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
@@ -331,8 +331,8 @@ beaker.cache.repo_cache_long.type = memo
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
-# default is memorylru_base cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memorylru_base cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
@@ -394,6 +394,8 @@ search.location = %(here)s/data/index
 ########################################
 ###    CHANNELSTREAM CONFIG         ####
 ########################################
+## channelstream enables persistent connections and live notification
+## in the system. It's also used by the chat system
 
 channelstream.enabled = true
 # location of channelstream server on the backend
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -102,7 +102,7 @@ full_stack = true
 ## return gzipped responses from Rhodecode (static files/application)
 gzip_responses = true
 
-# autogenerate javascript routes file on startup
+## autogenerate javascript routes file on startup
 generate_js_files = false
 
 ## Optional Languages
@@ -291,8 +291,8 @@ beaker.cache.sql_cache_short.type = memo
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-# default is memory cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memory cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
@@ -305,8 +305,8 @@ beaker.cache.repo_cache_long.type = memo
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
-# default is memorylru_base cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memorylru_base cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
@@ -368,6 +368,8 @@ search.location = %(here)s/data/index
 ########################################
 ###    CHANNELSTREAM CONFIG         ####
 ########################################
+## channelstream enables persistent connections and live notification
+## in the system. It's also used by the chat system
 
 channelstream.enabled = true
 # location of channelstream server on the backend