diff --git a/pandora_server/conf/tentacle_server.conf.new b/pandora_server/conf/tentacle_server.conf.new
index 1acf082ca2..a7cec8fd2c 100644
--- a/pandora_server/conf/tentacle_server.conf.new
+++ b/pandora_server/conf/tentacle_server.conf.new
@@ -5,10 +5,10 @@
 # Tentacle have IANA assigned port tpc/41121 as official port.
 ##########################################################################
 
-# [-a] IPv4 address to listen on. Several IPs cam be selected separating if by comma.
+# [-a] IPv4 address to listen on. Several IP adresses can be selected separated by commas.
 addresses 0.0.0.0
 
-# [-p] Port to listen on
+# [-p] Port number to listen on.
 port 41121
 
 # [-c] Maximum number of simultaneous connections
@@ -17,19 +17,19 @@ port 41121
 # [-d] Run as daemon. 1 true, 0 false
 daemon 1
 
-# [-i] Enable insecure mode
-# insecure 0
+# [-I] Enable insecure mode. 1 true, 0 false.
+#insecure 0
 
-# Filters (regexp:dir;regexp:dir...)
+# [-i] Filters (regexp:dir;regexp:dir...).
 filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands
 
 # [-m] Maximum file size allowed by the server in bytes
-#max_size 2000000
+# max_size 2000000
 
-# [-o] Accept files with a repeated name
+# [-o] Accept files with a repeated name. 1 true, 0 false.
 # overwrite 0
 
-# [-q] Do not output error messages.
+# [-q] No output error messages. 1 true, 0 false.
 # quiet 0
 
 # [-r] Number of retries for socket read/write operations
@@ -38,10 +38,10 @@ filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:co
 # [-s] Storage directory
 directory /var/spool/pandora/data_in
 
-# [-b] Address to proxy client requests to
+# [-b] IP address proxy client requests to.
 # proxy_ip 127.0.0.1
 
-# [-g] Port to proxy client requests to
+# [-g] Port number proxy client requests to.
 # proxy_port 41121
 
 # [-t] Timeout for socket read/write operations in seconds
@@ -71,5 +71,5 @@ log_file /dev/null
 # [-w] SSL password. Set to 1 to ask for password by command line
 # ssl_password 0
 
-# [-T] Use libwrap library (Authen::Libwrap perl module)
+# [-T] Use libwrap library (Authen::Libwrap perl module). 1 true, 0 false.
 # use_libwrap 0
\ No newline at end of file