[icinga-checkins] icinga.org: icinga-doc/master: docs issue #592, fixed links

git at icinga.org git at icinga.org
Tue Sep 14 22:50:11 CEST 2010


Module: icinga-doc
Branch: master
Commit: aa182d92547373470c7995e91dc7539183b69939
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=aa182d92547373470c7995e91dc7539183b69939

Author: Wolfgang <wnd at gmx.net>
Date:   Tue Sep 14 22:45:24 2010 +0200

docs issue #592, fixed links

---

 en/Icinga.xml       |    4 ++--
 en/adaptive.xml     |    4 ++--
 en/extcommands.xml  |    4 ++--
 en/extcommands2.xml |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/en/Icinga.xml b/en/Icinga.xml
index 14434bb..0ac0bed 100644
--- a/en/Icinga.xml
+++ b/en/Icinga.xml
@@ -221,8 +221,6 @@
 
     <xi:include href="extcommands.xml" />
 
-    <xi:include href="extcommands2.xml" />
-
     <xi:include href="eventhandlers.xml" />
 
     <xi:include href="volatileservices.xml" />
@@ -313,6 +311,8 @@
 
     <xi:include href="epnplugins.xml" />
 
+    <xi:include href="extcommands2.xml" />
+
     <xi:include href="icinga-web-scratch.xml" />
 
     <xi:include href="icinga-api.xml" />
diff --git a/en/adaptive.xml b/en/adaptive.xml
index de101e0..9c9c5d4 100644
--- a/en/adaptive.xml
+++ b/en/adaptive.xml
@@ -84,8 +84,8 @@
   file</link>. The table below lists the different attributes that may be changed during runtime, along with the external command
   to accomplish the job.</para>
 
-  <para>A full listing of external commands that can be used for adaptive monitoring can be found <link
-  xlink:href="http://www.nagios.org/developerinfo/externalcommands/">here</link>.</para>
+  <para>A full listing of external commands that can be used for adaptive monitoring can be found in the <link
+  linkend="extcommands2">list of external commands</link>.</para>
 
   <note>
     <itemizedlist>
diff --git a/en/extcommands.xml b/en/extcommands.xml
index 3931ef4..e607bf1 100644
--- a/en/extcommands.xml
+++ b/en/extcommands.xml
@@ -81,7 +81,7 @@
   submitted the external command to the command file. The values for the <emphasis>command_id</emphasis> and
   <emphasis>command_arguments</emphasis> arguments will depend on what command is being submitted to &name-icinga;.</para>
 
-  <para>A full listing of external commands that can be used (along with examples of how to use them) can be found in the next
-  <link linkend="extcommands2">document</link>.</para>
+  <para>A full listing of external commands that can be used can be found in the <link linkend="extcommands2">list of external
+  commands</link> in the development section.</para>
 
 </section>
diff --git a/en/extcommands2.xml b/en/extcommands2.xml
index a87addd..ed62a35 100644
--- a/en/extcommands2.xml
+++ b/en/extcommands2.xml
@@ -190,7 +190,7 @@
   <para>ACKNOWLEDGE_HOST_PROBLEM;<host_name>;<sticky>;<notify>;<persistent>;<author>;<comment></para>
 
   <para>Allows you to acknowledge the current problem for the specified host. By acknowledging the current problem, future notifications
-  (for the same host state) are disabled. If the "sticky" option is set to one (1), the acknowledgement will remain until the host returns
+  (for the same host state) are disabled. If the "sticky" option is set to two (2), the acknowledgement will remain until the host returns
   to an UP state. Otherwise the acknowledgement will automatically be removed when the host changes state. If the "notify" option is set to
   one (1), a notification will be sent out to contacts indicating that the current host problem has been acknowledged. If the "persistent"
   option is set to one (1), the comment associated with the acknowledgement will survive across restarts of the &name-icinga; process. If
@@ -201,7 +201,7 @@
   <para>ACKNOWLEDGE_SVC_PROBLEM;<host_name>;<service_description>;<sticky>;<notify>;<persistent>;<author>;<comment></para>
 
   <para>Allows you to acknowledge the current problem for the specified service. By acknowledging the current problem, future notifications
-  (for the same servicestate) are disabled. If the "sticky" option is set to one (1), the acknowledgement will remain until the service
+  (for the same servicestate) are disabled. If the "sticky" option is set to two (2), the acknowledgement will remain until the service
   returns to an OK state. Otherwise the acknowledgement will automatically be removed when the service changes state. If the "notify" option
   is set to one (1), a notification will be sent out to contacts indicating that the current service problem has been acknowledged. If the
   "persistent" option is set to one (1), the comment associated with the acknowledgement will survive across restarts of the &name-icinga;





More information about the icinga-checkins mailing list