Merge branch 'monitoring-plugins:master' into fix_version_return_code

7 files changed, 11 insertions, 11 deletions

diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 15d1634..f4d33a7 100644
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -28,7 +28,7 @@ use FindBin;
 use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
-# make us session leader which makes all childs exit if we do
+# make us session leader which makes all children exit if we do
 setsid;
 
 sub print_help ();
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index c190ce9..e335cda 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -134,7 +134,7 @@ if (defined $ifdescr || defined $iftype) {
         }
         if ($status==0) {
                 $state = "UNKNOWN";
-                printf "$state: could not retrive ifdescr/iftype snmpkey - $status-$snmpkey\n";
+                printf "$state: could not retrieve ifdescr/iftype snmpkey - $status-$snmpkey\n";
                 $session->close;
                 exit $ERRORS{$state};
         }
@@ -187,7 +187,7 @@ if (defined $ifXTable) {
          $name = $response->{$snmpIfDescr} ;
 }
 
-## if AdminStatus is down - some one made a consious effort to change config
+## if AdminStatus is down - some one made a conscious effort to change config
 ##
 if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
         $answer = "Interface $name (index $snmpkey) is administratively down.";
@@ -286,7 +286,7 @@ sub print_usage() {
         printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n";
         printf "Copyright (C) 2000 Christoph Kron\n";
         printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n";
-        printf "This programm is licensed under the terms of the ";
+        printf "This program is licensed under the terms of the ";
         printf "GNU General Public License\n(check source code for details)\n";
         printf "\n\n";
 }
@@ -424,7 +424,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 32984e5..38b87fc 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -354,7 +354,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index d869ae7..84f2022 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -60,7 +60,7 @@ sub print_usage ();
 sub connection ($$$$);
 sub bindRemote ($$);
 
-# -------------------------------------------------------------[ Enviroment ]--
+# -------------------------------------------------------------[ Environment ]--
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
@@ -208,7 +208,7 @@ MAIN:
 
         # Just in case of problems, let's not hang the monitoring system
         $SIG{'ALRM'} = sub {
-                print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
+                print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                 exit $ERRORS{"UNKNOWN"};
         };
         
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index f02c90f..49156af 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -4,7 +4,7 @@
 #   transmittal.  
 #
 # Initial version support sendmail's mailq command
-#  Support for mutiple sendmail queues (Carlos Canau)
+#  Support for multiple sendmail queues (Carlos Canau)
 #  Support for qmail (Benjamin Schmid)
 
 # License Information:
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index 47d6e49..8a56b9f 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -5,7 +5,7 @@
 # usage:
 #    check_rpc host service
 #
-# Check if an rpc serice is registered and running
+# Check if an rpc service is registered and running
 # using rpcinfo - $proto $host $prognum 2>&1 |";
 #
 # Use these hosts.cfg entries as examples
diff --git a/plugins-scripts/check_uptime.pl b/plugins-scripts/check_uptime.pl
index f954287..d73e40e 100755
--- a/plugins-scripts/check_uptime.pl
+++ b/plugins-scripts/check_uptime.pl
@@ -110,7 +110,7 @@ $pretty_uptime .= sprintf( "%d week%s, ",   $weeks, $weeks == 1 ? "" : "s" )  if
 $pretty_uptime .= sprintf( "%d day%s, ",    $days,  $days  == 1 ? "" : "s" )  if  $days;
 $pretty_uptime .= sprintf( "%d hour%s, ",   $hours, $hours == 1 ? "" : "s" )  if  $hours;
 $pretty_uptime .= sprintf( "%d minute%s, ", $mins,  $mins  == 1 ? "" : "s" )  if  $mins;
-# Replace last occurence of comma with "and"
+# Replace last occurrence of comma with "and"
 $pretty_uptime =~ s/, $/ and /;
 # Always print the seconds (though it may be 0 seconds)
 $pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" );