1 files changed, 15 insertions, 10 deletions

diff --git a/plugins/utils.h b/plugins/utils.h
index 325d6f02..1f376542 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -1,6 +1,6 @@
 #ifndef NP_UTILS_H
 #define NP_UTILS_H
-/* Header file for nagios plugins utils.c */
+/* Header file for monitoring plugins utils.c */
 
 /* This file should be included in all plugins */
 
@@ -131,7 +131,7 @@ char *fperfdata (const char *,
 {"warning",required_argument,0,'w'},\
 {"hostname",required_argument,0,'H'}
 
-#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
+#define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\
 \t<%s>\n\n"
 
 #define UT_HLP_VRS _("\
@@ -159,7 +159,8 @@ char *fperfdata (const char *,
 
 #define UT_VERBOSE _("\
  -v, --verbose\n\
-    Show details for command-line debugging (Nagios may truncate output)\n")
+    Show details for command-line debugging (output may be truncated by\n\
+                the monitoring system)\n")
 
 #define UT_WARN_CRIT _("\
  -w, --warning=DOUBLE\n\
@@ -173,15 +174,19 @@ char *fperfdata (const char *,
  -c, --critical=RANGE\n\
     Critical range\n")
 
-#define UT_TIMEOUT _("\
+#define UT_CONN_TIMEOUT _("\
  -t, --timeout=INTEGER\n\
     Seconds before connection times out (default: %d)\n")
 
+#define UT_PLUG_TIMEOUT _("\
+ -t, --timeout=INTEGER\n\
+    Seconds before plugin times out (default: %d)\n")
+
 #ifdef NP_EXTRA_OPTS
 #define UT_EXTRA_OPTS _("\
  --extra-opts=[section][@file]\n\
     Read options from an ini file. See\n\
-    https://www.nagios-plugins.org/doc/extra-opts.html\n\
+    https://www.monitoring-plugins.org/doc/extra-opts.html\n\
     for usage and examples.\n")
 #else
 #define UT_EXTRA_OPTS ""
@@ -189,16 +194,16 @@ char *fperfdata (const char *,
 
 #define UT_THRESHOLDS_NOTES _("\
  See:\n\
- https://www.nagios-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
+ https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
  for THRESHOLD format and examples.\n")
 
 #define UT_SUPPORT _("\n\
-Send email to help@nagios-plugins.org if you have questions regarding use\n\
-of this software. To submit patches or suggest improvements, send email to\n\
-devel@nagios-plugins.org\n\n")
+Send email to help@monitoring-plugins.org if you have questions regarding\n\
+use of this software. To submit patches or suggest improvements, send email\n\
+to devel@monitoring-plugins.org\n\n")
 
 #define UT_NOWARRANTY _("\n\
-The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
+The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n")