Merge branch 'master' of ssh://repo.or.cz/srv/git/nagiosplugins

3 files changed, 4 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 4dad53fb..60ecb87d 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ This file documents the major additions and syntax changes between releases.
         Re-bundled libtap as a built-in library (--enable-libtap): detects system library as pre-1.4.13 and does not install the built-in library anymore
         Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068)
         Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312)
-        check_http --onredirect=sticky follows using the same IP address (sf.net #2550208).
+        check_http --onredirect=sticky follows using the same IP address (sf.net #2550208)
         Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
 
 1.4.13 25th Sept 2008
diff --git a/THANKS.in b/THANKS.in
index 812bd372..36fd74f2 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -246,3 +246,4 @@ Jan Lipphaus
 Erik Welch
 Nik Soggia
 Olli Hauer
+Richard Edward Horner
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0982faf7..a8e08fa1 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1003,6 +1003,8 @@ print_help (void)
   printf ("    %s\n", _("Separates output on multiple OID requests"));
 
         printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (" %s\n", "-e, --retries=INTEGER");
+        printf ("    %s\n", _("Number of retries to be used in the requests"));
 
         printf (_(UT_VERBOSE));