Merge branch 'rename'

4 files changed, 10 insertions, 10 deletions

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 9623b1fa..a1ebb6d2 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
 
 EXTRA_DIST = t pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -83,7 +83,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
 pst3_LDFLAGS = @PST3CFLAGS@
-# pst3 must not use nagiosplug/gnulib includes!
+# pst3 must not use monitoringplug/gnulib includes!
 pst3_CPPFLAGS =
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 42eedec8..1ec5c396 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_dhcp plugin
+* Monitoring check_dhcp plugin
 * 
 * License: GPL
 * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2001-2007 Nagios Plugin Development Team
+* Copyright (c) 2001-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -35,7 +35,7 @@
 
 const char *progname = "check_dhcp";
 const char *copyright = "2001-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 56685f86..4c5b3326 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_icmp plugin
+* Monitoring check_icmp plugin
 * 
 * License: GPL
-* Copyright (c) 2005-2008 Nagios Plugins Development Team
+* Copyright (c) 2005-2008 Monitoring Plugins Development Team
 * Original Author : Andreas Ericsson <ae@op5.se>
 * 
 * Description:
@@ -40,9 +40,9 @@
 /* char *progname = "check_icmp"; */
 char *progname;
 const char *copyright = "2005-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
-/** nagios plugins basic includes */
+/** monitoring plugins basic includes */
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 8ca52814..ee9d108d 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -3,7 +3,7 @@
 * pst3
 * 
 * License: GPL
-* Copyright (c) 2008 Nagios Plugin Development Team
+* Copyright (c) 2008 Monitoring Plugins Development Team
 * 
 * Description:
 *