[icinga-checkins] icinga.org: icinga-doc/master: docs issue #2268: add contacts to implied inheritance table

git at icinga.org git at icinga.org
Tue Jan 17 00:49:12 CET 2012


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

Author: Wolfgang <wnd at gmx.net>
Date:   Tue Jan 17 00:44:06 2012 +0100

docs issue #2268: add contacts to implied inheritance table

---

 de/objectinheritance.xml |   24 +++++++++++++++++++++---
 en/objectinheritance.xml |   24 +++++++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/de/objectinheritance.xml b/de/objectinheritance.xml
index d092275..7721c12 100644
--- a/de/objectinheritance.xml
+++ b/de/objectinheritance.xml
@@ -313,7 +313,7 @@
         </row>
 
         <row>
-          <entry align="center" morerows="2" valign="middle"><para> <emphasis role="bold">Services</emphasis> </para></entry>
+          <entry align="center" morerows="3" valign="middle"><para> <emphasis role="bold">Services</emphasis> </para></entry>
 
           <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
 
@@ -321,6 +321,12 @@
         </row>
 
         <row>
+          <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+          <entry><para><emphasis>contacts</emphasis> in der verbundenen Host-Definition</para></entry>
+        </row>
+
+        <row>
           <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
           <entry><para><emphasis>notification_interval</emphasis> in der verbundenen Host-Definition</para></entry>
@@ -333,7 +339,7 @@
         </row>
 
         <row>
-          <entry align="center" morerows="2" valign="middle"><para> <emphasis role="bold">Host Escalations</emphasis>
+          <entry align="center" morerows="3" valign="middle"><para> <emphasis role="bold">Host Escalations</emphasis>
           </para></entry>
 
           <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
@@ -342,6 +348,12 @@
         </row>
 
         <row>
+          <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+          <entry><para><emphasis>contacts</emphasis> in der verbundenen Host-Definition</para></entry>
+        </row>
+
+        <row>
           <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
           <entry><para><emphasis>notification_interval</emphasis> in der verbundenen Host-Definition</para></entry>
@@ -354,7 +366,7 @@
         </row>
 
         <row>
-          <entry align="center" morerows="2" valign="middle"><para> <emphasis role="bold">Service Escalations</emphasis>
+          <entry align="center" morerows="3" valign="middle"><para> <emphasis role="bold">Service Escalations</emphasis>
           </para></entry>
 
           <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
@@ -363,6 +375,12 @@
         </row>
 
         <row>
+          <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+          <entry><para><emphasis>contacts</emphasis> in der verbundenen Service-Definition</para></entry>
+        </row>
+
+        <row>
           <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
           <entry><para><emphasis>notification_interval</emphasis> in der verbundenen Service-Definition</para></entry>
diff --git a/en/objectinheritance.xml b/en/objectinheritance.xml
index aabf4f0..fc4b9e2 100644
--- a/en/objectinheritance.xml
+++ b/en/objectinheritance.xml
@@ -327,7 +327,7 @@
                 </row>
 
                 <row>
-                    <entry align="left" morerows="2" valign="middle"><para> <emphasis role="bold">Services</emphasis> </para></entry>
+                    <entry align="left" morerows="3" valign="middle"><para> <emphasis role="bold">Services</emphasis> </para></entry>
 
                     <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
 
@@ -335,6 +335,12 @@
                 </row>
 
                 <row>
+                    <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+                    <entry><para><emphasis>contacts</emphasis> in the associated host definition</para></entry>
+                </row>
+
+                <row>
                     <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
                     <entry><para><emphasis>notification_interval</emphasis> in the associated host definition</para></entry>
@@ -347,7 +353,7 @@
                 </row>
 
                 <row>
-                    <entry align="left" morerows="2" valign="middle"><para> <emphasis role="bold">Host Escalations</emphasis> </para></entry>
+                    <entry align="left" morerows="3" valign="middle"><para> <emphasis role="bold">Host Escalations</emphasis> </para></entry>
 
                     <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
 
@@ -355,6 +361,12 @@
                 </row>
 
                 <row>
+                    <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+                    <entry><para><emphasis>contacts</emphasis> in the associated host definition</para></entry>
+                </row>
+
+                <row>
                     <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
                     <entry><para><emphasis>notification_interval</emphasis> in the associated host definition</para></entry>
@@ -367,7 +379,7 @@
                 </row>
 
                 <row>
-                    <entry align="left" morerows="2" valign="middle"><para> <emphasis role="bold">Service Escalations</emphasis> </para></entry>
+                    <entry align="left" morerows="3" valign="middle"><para> <emphasis role="bold">Service Escalations</emphasis> </para></entry>
 
                     <entry><para> <emphasis>contact_groups</emphasis> </para></entry>
 
@@ -375,6 +387,12 @@
                 </row>
 
                 <row>
+                    <entry><para> <emphasis>contacts</emphasis> </para></entry>
+
+                    <entry><para><emphasis>contacts</emphasis> in the associated service definition</para></entry>
+                </row>
+
+                <row>
                     <entry><para> <emphasis>notification_interval</emphasis> </para></entry>
 
                     <entry><para><emphasis>notification_interval</emphasis> in the associated service definition</para></entry>





More information about the icinga-checkins mailing list