diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index e4a37617fc..d819206cae 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,31 +1,31 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.771, GNU/Linux
+# Version 7.0.772 LTS Linux
 # Licensed under GPL license v2,
-# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
-# http://www.pandorafms.com
+# Copyright (c) 2004-2023 Pandora FMS
+# https://pandorafms.com
 
 # General Parameters
 # ==================
 
-server_ip 	localhost
-server_path 	/var/spool/pandora/data_in
+server_ip localhost
+server_path /var/spool/pandora/data_in
 temporal /tmp
 logfile /var/log/pandora/pandora_agent.log
 
 #include /etc/pandora/pandora_agent_alt.conf
 #broker_agent name_agent
 
-# Interval in seconds, 300 by default
-interval    	300
+# Interval in seconds, 300 by default (5 minutes)
+interval 300
 
 # Debug mode renames XML in the temp folder and continues running
-debug 		0	
+debug 0	
 
 # Optional. UDP Server to receive orders from outside
 # By default is disabled, set 1 to enable
 # Set port (41122 by default) 
 # Set address to restrict who can order a agent restart (0.0.0.0 = anybody)
-#
+
 udp_server 0
 udp_server_port 41122
 udp_server_auth_address 0.0.0.0
@@ -33,12 +33,13 @@ udp_server_auth_address 0.0.0.0
 #process_xeyes_start xeyes
 #process_xeyes_stop killall xeyes
 
-# By default, agent takes machine name
-#agent_name     adama
+# By default, agent takes hostname
+#agent_name adama
 
 # To define agent name by specific command, define 'agent_name_cmd'.
 # (In the following example, agent name is 'hostname_IP')
-# If set to __rand__ the agent will generate a random name.
+# If set to __rand__ the agent will generate a random name, used by default to generate a unique name
+
 #agent_name_cmd  LANG=C; /bin/echo -n `hostname`; /bin/echo -n "_"; /bin/echo `/sbin/ifconfig eth0 | /bin/grep 'inet addr' | /usr/bin/awk '{print $2;}' | /usr/bin/cut -d: -f2`
 agent_name_cmd __rand__
 
@@ -52,7 +53,7 @@ agent_name_cmd __rand__
 #agent_alias_cmd
 
 # Agent description
-#description This is a demo agent for Linux
+#description This is an agent running Linux
 
 # Group assigned for this agent (descriptive, p.e: Servers)
 group Servers
@@ -78,20 +79,19 @@ address auto
 # Those parameters define the geographical position of the agent 
 
 # gis_exec: Call a script that returns a string with a fixed
-# format of latitude,longitude,altitude
+# format of latitude, longitude, altitude. Used for custom integration with GIS
 # i.e.: 41.377,-5.105,2.365
 
-#gis_exec /tmp/gis.sh
+#gis_exec /mypath/my_gis_script.sh
 
 # This sets the GIS coordinates as fixed values:
-# latitude 
+
 #latitude 0
-# longitude
 #longitude 0
-# altitude
 #altitude 0
 
 #GPS Position description
+
 #position_description Madrid, centro
 
 # By default agent try to take default encoding defined in host.
@@ -133,7 +133,8 @@ transfer_mode tentacle
 # is much more safe
 #cron_mode 
 
-# If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
+# If set to 1 allows the agent to be configured via the web console (Only use this in Enterprise version)
+# when is set to 1, local .conf file changes are overwritten. Set to 0 if you want to edit the .conf file 
 remote_config 0
 
 # Default 0, set to 1 to avoid module executions and report to server
@@ -157,7 +158,7 @@ remote_config 0
 # Number of threads to execute modules in parallel
 #agent_threads 1
 
-# User the agent will run as
+# User the agent will run as. By default uses root, but could be configured to run as other user
 #pandora_user pandora
 
 # Enable or disable XML buffer.
@@ -177,9 +178,9 @@ temporal_max_files 1024
 # Agent mode: Learn (default), No-learn, Autodisable
 # agent_mode autodisable
 
-# eHorus agent configuration file path:
+# Pandora RC (former eHorus) agent configuration file path. 
 # The agent will create a custom field named eHorusID that contains
-# the eHorus agent's identifying key
+# the PandoraRC agent's identifying key
 ehorus_conf /etc/ehorus/ehorus_agent.conf
 
 # Secondary groups. You can select several groups separated by comma.
@@ -272,10 +273,22 @@ module_plugin autodiscover --default
 # Plugin for inventory on the agent.
 #module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
 
-# Log collection modules. Only for enterprise version, this will collect log files for forensic analysis.
-# This is for LOG monitoring, only on enterprise version
+# Log collection modules. This will collect log files for forensic analysis and store everything
+# This is for LOG monitoring. Different than log monitoring.
 #module_plugin grep_log_module /var/log/messages Syslog \.\*
 
+# Another samples of monitoring modules
+
+# Command snapshot
+
+#module_begin
+#module_name process_table
+#module_type generic_data_string
+#module_exec ps aux 
+#module_description Command snapshot of running processes
+#module_group System
+#module_end
+
 #module_begin
 #module_name HTTPD_Status
 #module_type generic_proc