7 files changed, 14 insertions, 14 deletions

diff --git a/tools/README b/tools/README
index 98c243b0..825ee56c 100644
--- a/tools/README
+++ b/tools/README
@@ -1,8 +1,8 @@
 The tools subdirectory contains anciliary files that can be used to configure
 or test the plugins.
 
-1. setup - used to get the configuration initialized after a CVS download
+1. setup - used for initialization after cloning the Git repository
 2. tango -
 3. mini_epn/p1.pl - used to test perl plugins for functionality under embedded
    perl
-4. distclean - used to clean the sources leaving only original CVS files
+4. distclean - used to clean the sources leaving only original Git files
diff --git a/tools/distclean b/tools/distclean
index f4ec20bd..961cc801 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -6,7 +6,7 @@
 # Please run this script from the top-level directory.
 
 if [ ! -f tools/distclean ]; then
-  echo "Please run this script from the top-level directory of Nagios-plugins."
+  echo "Please run this script from the top-level directory of Monitoring Plugins."
   exit 1
 fi
 
diff --git a/tools/generate-change-log b/tools/generate-change-log
index 03321fd8..3a6b38e7 100755
--- a/tools/generate-change-log
+++ b/tools/generate-change-log
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2013 Nagios Plugins Development Team
+# Copyright (c) 2013 Monitoring Plugins Development Team
 #
 # Originally written by Holger Weiss <holger@zedat.fu-berlin.de>.
 #
-# This file is free software; the Nagios Plugins Development Team gives
+# This file is free software; the Monitoring Plugins Development Team gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
diff --git a/tools/git-notify b/tools/git-notify
index 85142965..ff59d39d 100755
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -3,7 +3,7 @@
 # Tool to send git commit notifications
 #
 # Copyright 2005 Alexandre Julliard
-# Copyright 2009 Nagios Plugins Development Team
+# Copyright 2009 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook
index db9ad9ef..c822a63b 100755
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 prefix="${0%/*}/notifications"  # $GIT_DIR/hooks/notifications
-recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>'
+recipient='Monitoring Plugins Commits <commits@monitoring-plugins.org>'
 maxcommits=100
 maxdiffsize=$((300 * 1024))
-project='nagiosplug'
-gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug'
+project='monitoring-plugins'
+gitweburl='https://github.com/monitoring-plugins/monitoring-plugins'
 gitnotify="$prefix/git-notify.pl"
 statefile="$prefix/git-notify.dat"
 
diff --git a/tools/tango b/tools/tango
index 7f418d73..2737166e 100755
--- a/tools/tango
+++ b/tools/tango
@@ -14,9 +14,9 @@ my $REVISION = '$Revision$ ';
 $REVISION =~ s/^\$Revision: //;
 $REVISION =~ s/ \$ $//;
 
-my $PACKAGE = 'Nagios Plugins';
+my $PACKAGE = 'Monitoring Plugins';
 my $RELEASE = '1.3';
-my $WARRANTY = "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
+my $WARRANTY = "The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
 
 my $version = undef;
 my $help = undef;
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 12528d9b..48836b1e 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # tinderbox_build.pl
-# This script builds the nagiosplugins and then sends
+# This script builds the monitoringplugins and then sends
 # logs back to the master tinderbox server
 #
 # This script is based on mozilla-unix.pl which comes with tinderbox2
@@ -34,7 +34,7 @@ my $ReportStatus = 0;  # Do not send results to server
 my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
 
 # These shouldn't really need to be changed
-my $BuildTree = 'nagiosplug';
+my $BuildTree = 'monitoringplug';
 my $BuildName = '';
 my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
 
@@ -81,7 +81,7 @@ sub BuildIt {
         chdir("$StartDir");
 
         my $StartTime = time;
-        if (-e (my $file = "nagios-plugins.spec")) {
+        if (-e (my $file = "monitoring-plugins.spec")) {
                 open F, $file;
                 while (<F>) {
                         if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {