Index: src/zabbix_sender/zabbix_sender.c =================================================================== --- src/zabbix_sender/zabbix_sender.c (revision 6775) +++ src/zabbix_sender/zabbix_sender.c (working copy) @@ -272,7 +272,7 @@ if (NULL != config_source_ip_from_conf) { - if (NULL == CONFIG_SOURCE_IP) /* apply parameter only if unsetted */ + if (NULL == CONFIG_SOURCE_IP) /* apply parameter only if unset */ { CONFIG_SOURCE_IP = strdup(config_source_ip_from_conf); } @@ -282,7 +282,7 @@ if( zabbix_server_from_conf ) { if( !ZABBIX_SERVER ) - { /* apply parameter only if unsetted */ + { /* apply parameter only if unset */ if( (c = strchr(zabbix_server_from_conf, ',')) ) { /* get only first server */ *c = '\0'; @@ -293,14 +293,14 @@ } if( !ZABBIX_SERVER_PORT && zabbix_server_port_from_conf ) - { /* apply parameter only if unsetted */ + { /* apply parameter only if unset */ ZABBIX_SERVER_PORT = zabbix_server_port_from_conf; } if( zabbix_hostname_from_conf ) { if( !ZABBIX_HOSTNAME ) - { /* apply parameter only if unsetted */ + { /* apply parameter only if unset */ ZABBIX_HOSTNAME = strdup(zabbix_hostname_from_conf); } zbx_free(zabbix_hostname_from_conf); Index: src/zabbix_server/actions.c =================================================================== --- src/zabbix_server/actions.c (revision 6775) +++ src/zabbix_server/actions.c (working copy) @@ -663,11 +663,11 @@ * * * Function: check_action_conditions * * * - * Purpose: check if actions has to be processed for the event * - * (check all condition of the action) * + * Purpose: check if actions have to be processed for the event * + * (check all conditions of the action) * * * * Parameters: event - event to check * - * actionid - action ID for matching * + * actionid - action ID for matching * * * * Return value: SUCCEED - matches, FAIL - otherwise * * * Index: src/zabbix_server/events.c =================================================================== --- src/zabbix_server/events.c (revision 6775) +++ src/zabbix_server/events.c (working copy) @@ -59,7 +59,7 @@ * * * Author: Alexei Vladishev * * * - * Comments: use 'free_trigger_info' function to clear allocated memory * + * Comments: use 'free_trigger_info' function to clear allocated memory * * * ******************************************************************************/ static void add_trigger_info(DB_EVENT *event) @@ -127,7 +127,7 @@ /****************************************************************************** * * - * Function: free_trigger_info * + * Function: free_trigger_info * * * * Purpose: clean allocated memory by function 'add_trigger_info' * * * Index: src/zabbix_server/server.c =================================================================== --- src/zabbix_server/server.c (revision 6775) +++ src/zabbix_server/server.c (working copy) @@ -291,7 +291,7 @@ * * * Function: test * * * - * Purpose: test a custom developed functions * + * Purpose: test custom developed functions * * * * Parameters: * * * Index: src/zabbix_server/operations.c =================================================================== --- src/zabbix_server/operations.c (revision 6775) +++ src/zabbix_server/operations.c (working copy) @@ -46,7 +46,7 @@ * * * Function: send_to_user_medias * * * - * Purpose: send notifications to user's medias (email, sms, whatever) * + * Purpose: send notifications to user's media (email, sms, whatever) * * * * Parameters: trigger - trigger data * * action - action data * @@ -107,7 +107,7 @@ * * * Function: check_user_active * * * - * Purpose: checks if user in any users_disabled group * + * Purpose: checks if user is in any users_disabled group * * * * Parameters: userid - user id * * * @@ -138,7 +138,7 @@ * * * Function: op_notify_user * * * - * Purpose: send notifications to user or user groupd * + * Purpose: send notifications to user or user group * * * * Parameters: trigger - trigger data * * action - action data * Index: src/zabbix_agent/logfiles.c =================================================================== --- src/zabbix_agent/logfiles.c (revision 6775) +++ src/zabbix_agent/logfiles.c (working copy) @@ -38,7 +38,7 @@ * Author: Eugene Grigorjev * * * * Comments: * - * This function allocate memory for 'value', because use zbx_free. * + * This function allocates memory for 'value', because use zbx_free. * * Return SUCCEED and NULL value if end of file received. * * * * * Index: src/zabbix_agent/cpustat.c =================================================================== --- src/zabbix_agent/cpustat.c (revision 6775) +++ src/zabbix_agent/cpustat.c (working copy) @@ -35,8 +35,8 @@ * Parameters: pcpus - pointer to the structure * * of ZBX_CPUS_STAT_DATA type * * * - * Return value: If the function succeeds, the return 0, * - * great than 0 on an error * + * Return value: If the function succeeds, return 0, * + * bigger than 0 on an error * * * * Author: Eugene Grigorjev * * * @@ -131,7 +131,7 @@ * * * Function: close_cpu_collector * * * - * Purpose: Cleare state of data calculation * + * Purpose: Clear state of data calculation * * * * Parameters: pcpus - pointer to the structure * * of ZBX_CPUS_STAT_DATA type * Index: misc/conf/zabbix_trapper.conf =================================================================== --- misc/conf/zabbix_trapper.conf (revision 6775) +++ misc/conf/zabbix_trapper.conf (working copy) @@ -1,6 +1,6 @@ -# This is config file for zabbix_trapper +# This is a config file for zabbix_trapper # To get more information about ZABBIX, -# go http://www.zabbix.com +# go to http://www.zabbix.com ############ GENERAL PARAMETERS ################# @@ -35,7 +35,7 @@ DBUser=root # Database password -# Comment this line if no password used +# Comment this line if no password is used #DBPassword= Index: misc/conf/zabbix_agent.conf =================================================================== --- misc/conf/zabbix_agent.conf (revision 6775) +++ misc/conf/zabbix_agent.conf (working copy) @@ -1,6 +1,6 @@ -# This is config file for zabbix_agent +# This is a config file for zabbix_agent # To get more information about ZABBIX, -# go http://www.zabbix.com +# go to http://www.zabbix.com # IP address of ZABBIX server # Connections from other hosts will be denied @@ -16,7 +16,7 @@ # Format: UserParameter=, # Note that shell command must not return empty string or EOL only #UserParameter=system.test,who|wc -l -### Set of parameter for monitoring MySQL server (v3.23.42 and later) +### Set of parameters for monitoring MySQL server (v3.23.42 and later) ### Change -u and add -p if required #UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l #UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T" Index: misc/conf/zabbix_proxy.conf =================================================================== --- misc/conf/zabbix_proxy.conf (revision 6775) +++ misc/conf/zabbix_proxy.conf (working copy) @@ -1,6 +1,6 @@ -# This is config file for ZABBIX server process +# This is a config file for ZABBIX server process # To get more information about ZABBIX, -# go http://www.zabbix.com +# go to http://www.zabbix.com ############ GENERAL PARAMETERS ################# @@ -55,10 +55,10 @@ # must be between 1024 and 32767 #ListenPort=10051 -# Source IP address for outgouing connections +# Source IP address for outgoing connections #SourceIP= -# Listen interface for trapper. Trapper will listen all network interfaces +# Listen interface for trapper. Trapper will listen on all network interfaces # if this parameter is missing. #ListenIP=127.0.0.1 @@ -69,7 +69,7 @@ # This parameter must be between 0 and 3600 #HeartbeatFrequency=60 -# How often ZABBIX will perform sync configuration data +# How often ZABBIX will sync configuration data # (in seconds) # Default value is 3600 seconds (1h) # This parameter must be between 1 and 604800 (1 week) @@ -116,10 +116,7 @@ # After how many seconds of unreachability treat a host as unavailable #UnreachablePeriod=45 -# How ofter check host for availability during the unreachability period -#UnavailableDelay=15 - -# How ofter check host for availability during the unavailability period +# How often host is checked for availability during the unavailability period #UnavailableDelay=60 # Name of PID file @@ -132,24 +129,24 @@ # Maximum size of log file in MB. Set to 0 to disable automatic log rotation. #LogFileSize=1 -# Location for custom alert scripts +# Location of custom alert scripts AlertScriptsPath=/home/zabbix/bin/ # Location of external scripts #ExternalScripts=/etc/zabbix/externalscripts -# Location of 'fping. Default is /usr/sbin/fping -# Make sure that fping binary has root permissions and SUID flag set +# Location of fping. Default is /usr/sbin/fping +# Make sure that fping binary has root ownership and SUID flag set #FpingLocation=/usr/sbin/fping # Location of fping6. Default is /usr/sbin/fping6 -# Make sure that fping binary has root permissions and SUID flag set +# Make sure that fping binary has root ownership and SUID flag set #Fping6Location=/usr/sbin/fping6 # Temporary directory. Default is /tmp #TmpDir=/tmp -# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds. +# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Default is 60 seconds. #PingerFrequency=60 # Database host name @@ -166,7 +163,7 @@ DBUser=root # Database password -# Comment this line if no password used +# Comment this line if no password is used #DBPassword= Index: misc/conf/zabbix_agentd.conf =================================================================== --- misc/conf/zabbix_agentd.conf (revision 6775) +++ misc/conf/zabbix_agentd.conf (working copy) @@ -1,5 +1,5 @@ -# This is config file for zabbix_agentd -# To get more information about ZABBIX, go http://www.zabbix.com +# This is a config file for zabbix_agentd +# To get more information about ZABBIX, go to http://www.zabbix.com ############ GENERAL PARAMETERS ################# @@ -27,7 +27,7 @@ #ListenIP=127.0.0.1 -# Source IP address for outgouing connections +# Source IP address for outgoing connections #SourceIP= # Number of pre-forked instances of zabbix_agentd. @@ -36,15 +36,15 @@ StartAgents=5 -# How often refresh list of active checks. 2 minutes by default. +# How list of active checks is refreshed, in seconds. 2 minutes by default. #RefreshActiveChecks=120 -# Disable active checks. The agent will work in passive mode listening server. +# Disable active checks. The agent will work in passive mode listening for server. #DisableActive=1 -# Enable remote commands for ZABBIX agent. By default remote commands disabled. +# Enable remote commands for ZABBIX agent. By default remote commands are disabled. #EnableRemoteCommands=1 @@ -78,7 +78,7 @@ # Format: UserParameter=, # Note that shell command must not return empty string or EOL only #UserParameter=system.test,who|wc -l -### Set of parameter for monitoring MySQL server (v3.23.42 and later) +### Set of parameters for monitoring MySQL server (v3.23.42 and later) ### Change -u and add -p if required #UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l #UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T" @@ -87,4 +87,3 @@ #UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O" #UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":" #UserParameter=mysql.version,mysql -V - Index: misc/conf/zabbix_server.conf =================================================================== --- misc/conf/zabbix_server.conf (revision 6775) +++ misc/conf/zabbix_server.conf (working copy) @@ -1,6 +1,6 @@ -# This is config file for ZABBIX server process +# This is a config file for ZABBIX server process # To get more information about ZABBIX, -# go http://www.zabbix.com +# go to http://www.zabbix.com ############ GENERAL PARAMETERS ################# @@ -94,7 +94,7 @@ # After how many seconds of unreachability treat a host as unavailable #UnreachablePeriod=45 -# How often check host for availability during the unavailability period +# How often host is checked for availability during the unavailability period #UnavailableDelay=60 # Name of PID file @@ -109,18 +109,18 @@ # Maximum size of log file in MB. Set to 0 to disable automatic log rotation. #LogFileSize=1 -# Location for custom alert scripts +# Location of custom alert scripts AlertScriptsPath=/home/zabbix/bin/ # Location of external scripts #ExternalScripts=/etc/zabbix/externalscripts # Location of fping. Default is /usr/sbin/fping -# Make sure that fping binary has root permissions and SUID flag set +# Make sure that fping binary has root ownership and SUID flag set #FpingLocation=/usr/sbin/fping # Location of fping6. Default is /usr/sbin/fping6 -# Make sure that fping binary has root permissions and SUID flag set +# Make sure that fping binary has root ownership and SUID flag set #Fping6Location=/usr/sbin/fping6 # Temporary directory. Default is /tmp @@ -143,7 +143,7 @@ DBUser=root # Database password -# Comment this line if no password used +# Comment this line if no password is used #DBPassword= Index: frontends/php/include/setup.inc.php =================================================================== --- frontends/php/include/setup.inc.php (revision 6775) +++ frontends/php/include/setup.inc.php (working copy) @@ -131,7 +131,7 @@ function Stage0(){ return new CTag('div', 'yes', array('Welcome to the ZABBIX frontend installation wizard.',BR(),BR(), 'This installation wizard will guide you through the installation of ZABBIX frontend',BR(),BR(), - 'Click to "Next" button to proceed to the next screen. If you want to change something '. + 'Click the "Next" button to proceed to the next screen. If you want to change something '. 'on a previous screen, click "Previous" button',BR(),BR(), 'You may cancel installation at any time by clicking "Cancel" button'), 'text'); } @@ -211,7 +211,7 @@ 'PHP max execution time:', ini_get('max_execution_time').' sec', ini_get('max_execution_time') >= 300, - '300 sec is a maximal limitation on execution of PHP scripts')); + '300 sec is a minimal limitation on execution time of PHP scripts')); /* Check supporteds databases */ global $ZBX_CONFIG; @@ -222,7 +222,7 @@ 'PHP Databases support: ', new CScript(implode(SBR, $ZBX_CONFIG['allowed_db'])), !isset($ZBX_CONFIG['allowed_db']['no']), - 'Required any databases support [MySQL or PostgreSQL or Oracle]')); + 'Requires any database support [MySQL or PostgreSQL or Oracle]')); /* Check BC math */ $bcmath_fnc_exist = @@ -243,7 +243,7 @@ 'PHP BC math support', $bcmath_fnc_exist ? 'yes' : 'no', $bcmath_fnc_exist, - 'Required bcmath module [configured PHP with --enable-bcmath]')); + 'Requires bcmath module [configure PHP with --enable-bcmath]')); /* Check mb-strings $mbstrings_fnc_exist = mbstrings_available(); @@ -288,7 +288,7 @@ 'Image formats:', $img_formats, !isset($no_img_formats), - 'Required images genetarion support [PNG]')); + 'Requires images generation support [PNG]')); if(version_compare(phpversion(), '5.1.0RC1', '>=')){ $tmezone = ini_get('date.timezone'); @@ -310,7 +310,7 @@ $final_result = array( new CSpan(S_FAIL,'fail'), BR(), BR(), - 'Please correct all issuse and press "Retry" button', + 'Please correct all issues and press "Retry" button', BR(), BR(), new CButton('retry', S_RETRY) ); @@ -343,10 +343,10 @@ $table->AddRow(array(S_PASSWORD, new CPassBox('password', $this->GetConfig('DB_PASSWORD', '')))); return array( - 'Please create database manually.', BR(), - 'And set the configuration parameters of connection to this database.', + 'Please create database manually,', BR(), + 'and set the configuration parameters for connection to this database.', BR(),BR(), - 'And press "Test connection" button.', + 'Press "Test connection" button when done.', BR(),BR(), $table, BR(), @@ -434,7 +434,7 @@ $table1->AddRow(array('ZABBIX server port:', $this->GetConfig('ZBX_SERVER_PORT', 'unknown'))); return array( 'Please check configuration parameters.', BR(), - 'If all correct press "Next" button, or "Previous" button to change configuration parameters.', BR(), BR(), + 'If all is correct, press "Next" button, or "Previous" button to change configuration parameters.', BR(), BR(), $table, BR(), $table1 ); @@ -459,7 +459,7 @@ $table = new CTable(null, 'requirements'); $table->SetAlign('center'); - $table->AddRow(array('Configuration file:', $this->GetConfig('ZBX_CONFIG_FILE_CORRECT', false) ? + $table->AddRow(array('Configuration file: ', $this->GetConfig('ZBX_CONFIG_FILE_CORRECT', false) ? new CSpan(S_OK,'ok') : new CSpan(S_FAIL,'fail') )); @@ -480,15 +480,15 @@ $table, BR(), $this->DISABLE_NEXT_BUTTON ? array(new CButton('retry', S_RETRY), BR(),BR()) : null, !$this->GetConfig('ZBX_CONFIG_FILE_CORRECT', false) ? - array('Please install configuration file manualy.',BR(),BR(), - 'By pressing "Save configuration file" button download configuration file ', - 'and place them into the ',BR(), + array('Please install configuration file manualy, or fix permissions on 'conf' directory.',BR(),BR(), + 'Press "Save configuration file" button, download configuration file ', + 'and save it as ',BR(), '"'.$ZBX_CONFIGURATION_FILE.'"',BR(),BR(), new CButton('save_config',"Save configuration file"), BR(),BR() ) : null, - 'Press the '.($this->DISABLE_NEXT_BUTTON ? '"Retry"' : '"Next"').' button' + 'When done, press the '.($this->DISABLE_NEXT_BUTTON ? '"Retry"' : '"Next"').' button' ); } Index: Makefile.am =================================================================== --- Makefile.am (revision 6775) +++ Makefile.am (working copy) @@ -26,7 +26,7 @@ rm -f $(top_distdir)/splint rm -rf $(top_distdir)/test rm -f $(top_distdir)/TODO -##TODO makdir $(top_distdir)/docs +##TODO mkdir $(top_distdir)/docs ##TODO cp ?????/ZABBIX Manual v1.4.pdf $(top_distdir)/docs/ dbschema: