Fix some incorrect naming macros for monitoring plugins.

Refs ##5459
Icinga · Jan 14, 2014 · a47603c · a47603c
1 parent 1b9d77b
commit a47603c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/de/clusters.xml b/de/clusters.xml
@@ -70,7 +70,7 @@
     Statusinformationen jedes einzelnen Host- oder Service-Cluster-Elements zu ermitteln.</para>
 
     <para>noch mehr... Das <emphasis>check_cluster</emphasis>-Plugin finden Sie im contrib-Verzeichnis der &name-nagios;-Plugins unter <link
-		    xlink:href="https://www.monitoring-plugins.org">&url-nagiosplug;/</link>.</para>
+		    xlink:href="https://www.monitoring-plugins.org">&url-monitoringplug;/</link>.</para>
   </section>
 
   <section xml:id="serviceclusters">

diff --git a/de/plugins.xml b/de/plugins.xml
@@ -92,11 +92,11 @@
 
     <itemizedlist>
       <listitem>
-	      <para>&name-nagios; Plugins Project: <link xlink:href="https://www.monitoring-plugins.org">&url-nagiosplug;</link></para>
+	      <para>&name-monitoringplug; Project: <link xlink:href="https://www.monitoring-plugins.org">&url-monitoringplug;</link></para>
       </listitem>
 
       <listitem>
-	      <para>&name-nagios; Downloads Page: <link xlink:href="https://www.monitoring-plugins.org">&url-nagiosplug;/download.html</link></para>
+	      <para>&name-monitoringplug; Downloads Page: <link xlink:href="https://www.monitoring-plugins.org">&url-monitoringplug;/download.html</link></para>
       </listitem>
 
       <listitem>

diff --git a/en/clusters.xml b/en/clusters.xml
@@ -74,7 +74,7 @@
   information of each individual host or service cluster elements.</para>
 
   <para>More to come... The <emphasis>check_cluster</emphasis> plugin can be found in the contrib directory of the &name-nagios;
-	  Plugins release at <link xlink:href="https://www.monitoring-plugins.org">&url-nagiosplug;</link>.</para>
+	  Plugins release at <link xlink:href="https://www.monitoring-plugins.org">&url-monitoringplug;</link>.</para>
 
   </section>
 

diff --git a/en/plugins.xml b/en/plugins.xml
@@ -88,12 +88,12 @@
 
     <itemizedlist>
       <listitem>
-        <para>&name-nagios; Plugins Project: <link
-			xlink:href="https://www.monitoring-plugins.org">&url-nagiosplug;</link></para>
+        <para>&name-monitoringplug; Project: <link
+			xlink:href="https://www.monitoring-plugins.org">&url-monitoringplug;</link></para>
       </listitem>
 
       <listitem>
-	      <para>&name-nagios; Downloads Page: <link xlink:href="https://www.monitoring-plugins.org/download.html">&url-nagiosplug;/download.html</link></para>
+	      <para>&name-monitoringplug; Downloads Page: <link xlink:href="https://www.monitoring-plugins.org/download.html">&url-monitoringplug;/download.html</link></para>
       </listitem>
 
       <listitem>

diff --git a/ent/names.ent b/ent/names.ent
@@ -4,6 +4,7 @@
 <!ENTITY name-nsca "NSCA">
 <!ENTITY name-nsclient "NSClient++">
 <!ENTITY name-nagios "Nagios">
+<!ENTITY name-monitoringplug "Monitoring Plugins">
 <!ENTITY name-nagioswiki "Nagios Wiki">
 <!ENTITY name-icingawiki "Icinga Wiki">
 <!ENTITY name-icinga "Icinga">

diff --git a/ent/urls.ent b/ent/urls.ent
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!ENTITY url-nagios "http://www.nagios.org/">
-<!ENTITY url-nagiosplug "https://www.monitoring-plugins.org">
+<!ENTITY url-monitoringplug "https://www.monitoring-plugins.org">
 <!ENTITY url-nagios-dev-guidelines "https://www.nagios-plugins.org/doc/guidelines.html">
 <!ENTITY url-nagios-nrpe "http://sourceforge.net/projects/nagios/files/nrpe-2.x/">
 <!ENTITY url-icinga "https://www.icinga.org/">