Merge branch 'master' of github.com-sreinhardt:NagiosEnterprises/nagiosplugins-private

ACKNOWLEDGEMENTS

@@ -1,6 +1,6 @@
 This file contains the origin of code copied verbatim into some or all of the Nagios plugins.
 
-The NagiosPlugin team thanks the original authors.
+The NagiosPlugin team would like to thank the Ethan Galstad and all the other original authors.
 
 Copied code is cited in the source by indented comments of the form
 

AUTHORS

@@ -2,6 +2,7 @@ The Nagios Plugins are brought to you by the Nagios Plugins Development Team.
 
 Jeremy T. Bouse
 Peter Bray
+Andy Brist
 Gavin Carr
 Karl DeBisschop
 Matthias Eble
@@ -14,6 +15,7 @@ Matthew Kent
 Harper Mann
 Benoit Mortier
 Sven Nierlein
+Spenser Reinhardt
 Eric Stanley
 Nathan Vonnahme
 Ton Voon

FAQ

@@ -8,6 +8,11 @@ A: All plugins that comply with minimal development guideline for
    can be read executing plugin with the -h or --help option. If 
    the '-h' option does not work, that is a bug.
 
+   Additionally, the man pages for the plugins are available on the
+   nagios-plugins website at:
+
+   http://nagios-plugins.org/doc/man/index.html
+
 
 Q: What version of <insert name> plugin am I running?
 
@@ -15,7 +20,7 @@ A: All plugins that comply with minimal development guideline for
    this project include detailed version information.  When executed
    with the '-V' option, a version string will be printed:
 
-   check_radius v1.4.16 (nagios-plugins 1.4.16)
+   check_radius v2.0 (nagios-plugins 2.0)
 
    All bug reports and help requests should reference this
    information.
@@ -67,7 +72,8 @@ A: Beginning with the 1.2.9-1 release, you may run
 
 Q: I get an error like
 
-   Warning: Return code of 127 for check of service 'PING' on host 'anyhost' was out of bounds.
+   Warning: Return code of 127 for check of service 'PING' on host 
+   'anyhost' was out of bounds.
 
    when I run Nagios. (Often check_ping runs just fine on the
    command line).
@@ -84,8 +90,19 @@ A: Commonly, system administrators will make security as tight as
 
 Q: I have a plugin to offer. What can I do?
 
-A: You can make it available on NagiosExchange (http://nagiosexchange.org)
-   where other people can find it for use.
+A: Contact a nagios-plugins team member in one of the following ways:
+
+   a) Forums:  
+	http://support.nagios.com/forum/viewforum.php?f=35
+
+   b) Mailing-list: 
+	http://lists.nagios.com/mailman/listinfo/nagiosplugin-devel 
+
+   c) Github:
+	https://github.com/nagios-plugins/nagios-plugins
+
+   d) If all else fails, post it to the Nagios Exchange:
+	http://exchange.nagios.org/
 
-   You can also get feedback on improving the plugin via the 
-   devel@nagios-plugins.org mailing list.
+   You can also get feedback on improving the plugin via any of the 
+   methods above.

README

@@ -81,6 +81,35 @@ That's it!  If you have any problems or questions, feel free to send an
 email to <help@nagios-plugins.org>.
 
 
+Testing With libtap
+-------------------
+
+1.  The nagios-plugins source includes a perl testing suite.  the libtap 
+    library and headers are included with the source.  Configure with:
+
+	./configure --enable-libtap
+
+    Note: "--enable-extra-opts" used to be required as well, but is no 
+    longer required as it is a default configure option.
+
+2.  Make and then make test:
+
+	make
+	make test
+
+3.  Testing is pseudo intelligent and will try to autodetect which plugins
+    to test.  You may need to look at the REQUIREMENTS doc as to what
+    dependencies are required to satisfy the test.
+
+    Additionally, default and user supplied (at runtime) testing parameters
+    are saved in the file:
+
+	/var/tmp/NPTest.cache
+
+    If you need to change any testing parameters, edit them in this file
+    or just remove the line to force the test to re-prompt you for input.
+
+
 License Notice
 --------------
 

SUPPORT

@@ -1,4 +1,24 @@
-SUPPORT
+FORUMS SUPPORT
+--------------
+
+Even though the mailing list are still used for support, the forums are
+by far the fastest and best way to receive support these days.
+
+General plugin usage and Nagios integration questions can be posted at:
+
+    http://support.nagios.com/forum/viewforum.php?f=7
+
+Bug reports and development queries should be posted to the development
+forums:
+
+    http://support.nagios.com/forum/viewforum.php?f=35
+
+The mailing lists are still alive and you are welcome to post your
+questions to the list if you are inclined to do so:
+
+
+MAILING LIST SUPPORT
+--------------------
 
 Using the mailing lists and tracker databases at SourceForge are the
 best ways to obtain direct support for the Nagios Plugins. There may
@@ -19,16 +39,18 @@ you interest to do a modest amount of legwork before posting to either
 of these lists.
 
 Plugins that are in the contrib directories are provided as-is. We will 
-try to help, but sometimes the plugins have dependencies that the nagios-plugin
-developers do not have access to. You may be able to try the authors
-directly.
+try to help, but sometimes the plugins have dependencies that the
+nagios-plugin developers do not have access to. You may be able to try
+the authors directly.
 
 In brief, always provide the version of the software that you are
 using, and when requesting features or reporting bugs, first check to
 see that the issue has not already been addressed in the current Git
 code.
 
+
 GETTING HELP
+------------
 
 Requests to 'help' require posting the version number of the
 plugin. The best place to include the version information is in the
@@ -44,7 +66,9 @@ plugins) will provide a description of their use when invoked with the
 '--help' option. Please read the help carefully and in it's entirety
 before asking for support.
 
+
 REPORTING BUGS AND SUBMITTING PATCHES
+-------------------------------------
 
 Bug reports, investigations of possible bugs, feature requests, and
 patch submissions should be submitted to the development list at