11 files changed, 173 insertions, 116 deletions

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 8ee6dd4f..6d42e1d3 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -11,6 +11,9 @@
 *
 * This file contains the check_radius plugin
 *
+*  Tests to see if a radius server is accepting connections.
+*
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 7922bfa9..17331f92 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -11,6 +11,9 @@
 *
 * This file contains the check_real plugin
 *
+*  This plugin tests the REAL service on the specified host.
+*
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index e4da30ed..ee6d0cb7 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -11,6 +11,9 @@
 *
 * This file contains the check_smtp plugin
 *
+*  This plugin will attempt to open an SMTP connection with the host.
+*
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
@@ -778,8 +781,8 @@ void
 print_usage (void)
 {
   printf (_("Usage:"));
-        printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
-                  [-A authtype -U authuser -P authpass]\n\
-                  [-w warn] [-c crit] [-t timeout] [-S] [-D days] [-n] [-v] [-4|-6]\n", progname);
+        printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
+  printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
+  printf ("[-S] [-D days] [-n] [-v] [-4|-6]\n");
 }
 
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index ba31df09..ce4c0848 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -11,6 +11,10 @@
 *
 * This file contains the check_ssh plugin
 *
+*
+*  Try to connect to an SSH server at specified server and port
+*
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index fa989746..db8ebf95 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,33 +1,40 @@
 /******************************************************************************
- *
- * Program: Swap space plugin for Nagios
- * License: GPL
- *
- * License Information:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
- *
- * $Id$
- *
- *****************************************************************************/
+*
+* Nagios check_disk plugin
+*
+* License: GPL
+* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+* Copyright (c) 2000-2006 nagios-plugins team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* This file contains the check_disk plugin
+*
+* License Information:
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+* $Id$
+*
+*****************************************************************************/
 
 const char *progname = "check_swap";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2004";
+const char *copyright = "2000-2006";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -491,28 +498,29 @@ print_help (void)
 
         printf (_(COPYRIGHT), copyright, email);
 
-        printf (_("Check swap space on local machine.\n\n"));
+        printf ("%s\n", _("Check swap space on local machine."));
 
+  printf ("\n\n");
+  
         print_usage ();
 
         printf (_(UT_HELP_VRSN));
 
-        printf (_("\n\
- -w, --warning=INTEGER\n\
-   Exit with WARNING status if less than INTEGER bytes of swap space are free\n\
- -w, --warning=PERCENT%%\n\
-   Exit with WARNING status if less than PERCENT of swap space is free\n\
- -c, --critical=INTEGER\n\
-   Exit with CRITICAL status if less than INTEGER bytes of swap space are free\n\
- -c, --critical=PERCENT%%\n\
-   Exit with CRITCAL status if less than PERCENT of swap space is free\n\
- -a, --allswaps\n\
-    Conduct comparisons for all swap partitions, one by one\n\
- -v, --verbose\n\
-    Verbose output. Up to 3 levels\n"));
-
-        printf (_("\n\
-On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
+        printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
+  printf (" %s\n", "-w, --warning=PERCENT%%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of swap space is free"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free"));
+  printf (" %s\n", "-c, --critical=PERCENT%%");
+  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
+  printf (" %s\n", "-a, --allswaps");
+  printf ("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
+  printf (" %s\n", "-v, --verbose");
+  printf ("    %s\n", _("Verbose output. Up to 3 levels"));
+        printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
 
         printf (_(UT_SUPPORT));
 }
@@ -522,7 +530,7 @@ On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
 void
 print_usage (void)
 {
-        printf ("\
-Usage: %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
-       %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
+        printf (_("Usage:"));
+  printf ("%s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
+  printf ("%s [-av] -w <bytes_free> -c <bytes_free>\n", progname);
 }
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index bbb8d111..00105f9f 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,27 +1,40 @@
 /*****************************************************************************
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
- 
+*
+* Nagios check_tcp plugin
+*
+* License: GPL
+* Copyright (c) 1999-2006 nagios-plugins team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* This file contains the check_tcp plugin
+*
+* License Information:
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+* $Id$
+* 
 *****************************************************************************/
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
 const char *revision = "$Revision$";
-const char *copyright = "1999-2004";
+const char *copyright = "1999-2006";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -589,35 +602,31 @@ print_help (void)
 
         printf (_(UT_IPv46));
 
-        printf (_("\
- -E, --escape\n\
-    Can use \\n, \\r, \\t or \\ in send or quit string.\n\
-    Default: nothing added to send, \\r\\n added to end of quit\n\
- -s, --send=STRING\n\
-    String to send to the server\n\
- -e, --expect=STRING\n\
-    String to expect in server response\n\
- -q, --quit=STRING\n\
-    String to send server to initiate a clean close of the connection\n"));
-
-        printf (_("\
- -r, --refuse=ok|warn|crit\n\
-    Accept tcp refusals with states ok, warn, crit (default: crit)\n\
- -M, --mismatch=ok|warn|crit\n\
-    Accept expected string mismatches with states ok, warn, crit (default: warn)\n\
- -j, --jail\n\
-    Hide output from TCP socket\n\
- -m, --maxbytes=INTEGER\n\
-    Close connection once more than this number of bytes are received\n\
- -d, --delay=INTEGER\n\
-    Seconds to wait between sending string and polling for response\n"));
+        printf (" %s\n", "-E, --escape");
+  printf ("    %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string."));
+  printf ("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
+  printf (" %s\n", "-s, --send=STRING");
+  printf ("    %s\n", _("String to send to the server"));
+  printf (" %s\n", "-e, --expect=STRING");
+  printf ("    %s\n", _("String to expect in server response"));
+  printf (" %s\n", "-q, --quit=STRING");
+  printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
+        printf (" %s\n", "-r, --refuse=ok|warn|crit");
+  printf ("    %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
+  printf (" %s\n", "-M, --mismatch=ok|warn|crit");
+  printf ("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
+  printf (" %s\n", "-j, --jail");
+  printf ("    %s\n", _("Hide output from TCP socket"));
+  printf (" %s\n", "-m, --maxbytes=INTEGER");
+  printf ("    %s\n", _("Close connection once more than this number of bytes are received"));
+  printf (" %s\n", "-d, --delay=INTEGER");
+  printf ("    %s\n", _("Seconds to wait between sending string and polling for response"));
 
 #ifdef HAVE_SSL
-        printf (_("\
- -D, --certificate=INTEGER\n\
-    Minimum number of days a certificate has to be valid.\n\
- -S, --ssl\n\
-    Use SSL for the connection.\n"));
+        printf (" %s\n", "-D, --certificate=INTEGER");
+  printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
+  printf (" %s\n", "-S, --ssl");
+  printf ("    %s\n", _("Use SSL for the connection."));
 #endif
 
         printf (_(UT_WARN_CRIT));
@@ -633,11 +642,10 @@ print_help (void)
 void
 print_usage (void)
 {
-        printf ("\
-Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
-                  [-s <send string>] [-e <expect string>] [-q <quit string>]\n\
-                  [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
-                  [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
-                  [-D <days to cert expiry>] [-S <use SSL>] [-E]\n", progname);
+        printf (_("Usage:"));
+  printf ("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",progname);
+  printf ("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
+  printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
+  printf ("[-D <days to cert expiry>] [-S <use SSL>] [-E]\n");
 }
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 84cdcd53..ca420566 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -11,6 +11,8 @@
 *
 * This file contains the check_time plugin
 *
+*  This plugin will check the time on the specified host.
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 110ea0a2..280b3fb6 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -14,6 +14,9 @@
 *
 * This file contains Network UPS Tools plugin for Nagios
 *
+*  This plugin tests the UPS service on the specified host.Network UPS Tools
+*  from www.networkupstools.org must be running for thisplugin to work.
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
@@ -36,7 +39,7 @@
 
 const char *progname = "check_ups";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2006";
+const char *copyright = "2002-2006";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 34d47752..0c62e3b1 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -3,7 +3,7 @@
 * Nagios check_users plugin
 *
 * License: GPL
-* Copyright (c) 2002-2006 nagios-plugins team
+* Copyright (c) 2000-2006 nagios-plugins team
 *
 * Last Modified: $Date$
 *
@@ -11,6 +11,9 @@
 *
 * This file contains the check_users plugin
 *
+*  This plugin checks the number of users currently logged in on the local
+*  system and generates an error if the number exceeds the thresholds specified.
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/negate.c b/plugins/negate.c
index 76bb6bbb..45c03269 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -11,6 +11,8 @@
 *
 * This file contains the negate plugin
 *
+*  Negates the status of a plugin (returns OK for CRITICAL, and vice-versa)
+*
 * License Information:
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 5bff4b2f..7793e9a8 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,18 +1,36 @@
 /******************************************************************************
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+* Nagios urlize plugin
+*
+* License: GPL
+* Copyright (c) 2000-2006 nagios-plugins team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* This file contains the urlize plugin
+*
+*  This plugin wraps the text output of another command (plugin)
+*  in HTML <A> tags, thus displaying the plugin output in as a clickable link in
+*  the Nagios status screen.  The return status is the same as the invoked plugin.
+*
+* License Information:
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
 
  $Id$