[icinga-checkins] icinga.org: icinga-doc/master: Modified chapter 6, modified index and som typos

git at icinga.org git at icinga.org
Mon Sep 20 22:53:06 CEST 2010


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

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Mon Sep 20 22:40:58 2010 +0200

Modified chapter 6, modified index and som typos

---

 de/Icinga.xml         |    4 +---
 de/cgis.xml           |    6 +++---
 de/howtos.xml         |    3 +++
 de/icinga-web-pnp.xml |   11 ++++++++---
 de/startstop.xml      |    3 ++-
 en/Icinga.xml         |    3 +--
 en/cgis.xml           |    6 +++---
 en/icinga-web-pnp.xml |   11 ++++++++---
 en/startstop.xml      |    3 ++-
 9 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/de/Icinga.xml b/de/Icinga.xml
index 3d78e6c..7431fcb 100644
--- a/de/Icinga.xml
+++ b/de/Icinga.xml
@@ -211,13 +211,11 @@
     <xi:include href="networkreachability.xml" />
 
     <xi:include href="notifications.xml" />
-
-    <xi:include href="cgis.xml" />
   </chapter>
 
   <chapter version="5.0" xml:id="ch06">
     <title>Die Benutzeroberflächen</title>
-
+<xi:include href="cgis.xml" />
     <xi:include href="icinga-web-scratch.xml" />
 
     <xi:include href="icinga-web-pnp.xml" />
diff --git a/de/cgis.xml b/de/cgis.xml
index 63f9665..4e99b93 100644
--- a/de/cgis.xml
+++ b/de/cgis.xml
@@ -7,11 +7,11 @@
          xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg"
          xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns:db="http://docbook.org/ns/docbook">
-  <title>Informationen über die CGIs</title>
+  <title>&name-ui;: Informationen über die CGIs</title>
 
-  <para><emphasis role="bold">Einführung</emphasis></para>
+  <para><emphasis role="bold">Einführung in das &name-ui;</emphasis></para>
 
-  <para>Die verschiedenen mit &name-icinga; gelieferten CGIs werden hier beschrieben, zusammen mit den Autorisierungsanforderungen
+  <para>Die verschiedenen mit dem &name-icinga; Core gelieferten CGIs werden hier beschrieben, zusammen mit den Autorisierungsanforderungen
   für den Zugriff und den Gebrauch jedes CGIs. Im Grundzustand erwarten die CGIs, dass Sie sich dem Web-Server gegenüber
   authentifiziert haben und autorisiert sind, jede Information zu sehen, die Sie anfordern. Mehr Informationen über die
   Konfiguration der Autorisierung finden Sie <link linkend="cgiauth">hier</link>.</para>
diff --git a/de/howtos.xml b/de/howtos.xml
index ef83e0e..b500053 100644
--- a/de/howtos.xml
+++ b/de/howtos.xml
@@ -42,6 +42,9 @@
             <listitem>
                 <para>"ICINGA 1.0.2 in einer Microsoft Hyper-V Maschine mit Ubuntu 10.04 Desktop installieren"</para>
             </listitem>
+	<listitem>
+<para>"Zusatzkomponenten/Plug-Ins und Perl Skripte für ICINGA 1.0.2 installieren"</para>
+</listitem>
         </itemizedlist> als PDF's zum downloaden.</para>
 
     <para>Herzlichen Dank an ALLE die ihre Dokumentationen anderen zur Verfügung stellen!</para>
diff --git a/de/icinga-web-pnp.xml b/de/icinga-web-pnp.xml
index e8b7f02..bdcfecf 100644
--- a/de/icinga-web-pnp.xml
+++ b/de/icinga-web-pnp.xml
@@ -8,14 +8,14 @@
          xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
   <title>Integration von &name-pnp; in das &name-web; Frontend</title>
 
-  <para>Mit Hilfe dieser Anleitung können Sie &name-pnp; in das &name-web; Frontend integrieren</para>
+  <para>Mit Hilfe dieser Anleitung können Sie &name-pnp; in das &name-web; Frontend integrieren.</para>
 
   <para><figure>
       <title>&name-pnp; integrated in &name-web;</title>
 
       <mediaobject>
         <imageobject role="html">
-          <imagedata align="left" fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
+          <imagedata fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
         </imageobject>
       </mediaobject>
     </figure></para>
@@ -50,7 +50,7 @@ $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
 
       <para>Bitte erstellen Sie eine Kopie von icinga-host-template.xml in app/modules/Cronks/data/xml/grid unter Ihrem icinga-web
       Installationspfad: <programlisting>cp /usr/share/icinga-web/app/modules/Cronks/data/xml/grid/icinga-host-template.xml /usr/share/icinga-web/app/modules/Cronks/data/xml/grid/icinga-my-host-template.xml</programlisting>
-      In der neuen Datein legen wir eine zusätzliche Feld (field) Definition an: <programlisting><field name="pnp4nagios_host_link">
+      In der neuen Datei legen wir eine zusätzliche Feld- (field) Definition an: <programlisting><field name="pnp4nagios_host_link">
             <!-- datasource maps a data field from api call -->
             <datasource>
                 <parameter name="field">HOST_NAME</parameter>
@@ -122,4 +122,9 @@ $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
 </ae:parameter></programlisting></para>
     </listitem>
   </orderedlist>
+<indexterm zone="icinga-web-pnp">
+        <primary>&name-pnp;</primary>
+
+        <secondary>&name-pnp; und  &name-web;</secondary>
+    </indexterm>
 </section>
diff --git a/de/startstop.xml b/de/startstop.xml
index 57da321..0d14490 100644
--- a/de/startstop.xml
+++ b/de/startstop.xml
@@ -129,6 +129,7 @@
     <primary>&name-icinga; Kommandozeilenoptionen</primary>
 
     <secondary>Option -d (Daemon-Modus)</secondary>
-<tertiary>&name-icinga; Log-Optionen</tertiary>
+<indexterm zone="startstop">
+    <primary>&name-icinga; Log-Optionen</primary>
   </indexterm>
 </section>
diff --git a/en/Icinga.xml b/en/Icinga.xml
index b0b2a51..c40549e 100644
--- a/en/Icinga.xml
+++ b/en/Icinga.xml
@@ -217,11 +217,10 @@
     <xi:include href="networkreachability.xml" />
 
     <xi:include href="notifications.xml" />
-
-    <xi:include href="cgis.xml" />
   </chapter>
 <chapter version="5.0" xml:id="ch06">
     <title>User Interfaces</title>
+<xi:include href="cgis.xml" />
 <xi:include href="icinga-web-scratch.xml" />
 <xi:include href="icinga-web-pnp.xml" />
 </chapter>
diff --git a/en/cgis.xml b/en/cgis.xml
index d53caa5..0be46dc 100644
--- a/en/cgis.xml
+++ b/en/cgis.xml
@@ -7,11 +7,11 @@
          xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg"
          xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns:db="http://docbook.org/ns/docbook">
-  <title><anchor xml:id="information_on_cgis" />Information On The CGIs</title>
+  <title><anchor xml:id="information_on_cgis" />&name-ui;: Information On The CGIs</title>
 
-  <para><emphasis role="bold">Introduction</emphasis></para>
+  <para><emphasis role="bold">Introduction of the &name-ui;</emphasis></para>
 
-  <para>The various CGIs distributed with &name-icinga; are described here, along with the authorization requirements for
+  <para>The various CGIs distributed with &name-icinga; core are described here, along with the authorization requirements for
   accessing and using each CGI. By default the CGIs require that you have authenticated to the web server and are authorized to
   view any information you are requesting. More information on configuring authorization can be found <link
   xlink:href="cgiauth">here</link>.</para>
diff --git a/en/icinga-web-pnp.xml b/en/icinga-web-pnp.xml
index 0097721..2d7d224 100644
--- a/en/icinga-web-pnp.xml
+++ b/en/icinga-web-pnp.xml
@@ -6,7 +6,7 @@
 <section version="5.0" xml:id="icinga-web-pnp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML"
          xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
-  <title>Integration von &name-pnp; in das &name-web; Frontend</title>
+  <title>Integration from &name-pnp; to &name-web;</title>
 
   <para>Here we give you a little instruction how to integrate &name-pnp; to the &name-web; Frontend.</para>
 <para>
@@ -14,7 +14,7 @@
     <title>&name-pnp; integrated in &name-web;</title>
     <mediaobject>
       <imageobject role="html">
-        <imagedata align="left" fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
+        <imagedata fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
       </imageobject>
     </mediaobject>
   </figure>
@@ -28,7 +28,7 @@
     </listitem>
 
     <listitem>
-      <para>Change the &name-pnp; configuration to match your &name-icinga; configuration.You probably want to change these:
+      <para>Change the &name-pnp; configuration to match your &name-icinga; configuration. You probably want to change these:
       <programlisting>#> vi npcd.cfg
     user = icinga
     group = icinga
@@ -121,4 +121,9 @@ $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
 </ae:parameter></programlisting></para>
     </listitem>
   </orderedlist>
+<indexterm zone="icinga-web-pnp">
+        <primary>&name-pnp;</primary>
+
+        <secondary>&name-pnp; with &name-web;</secondary>
+    </indexterm>
 </section>
diff --git a/en/startstop.xml b/en/startstop.xml
index 0bffd16..2113ed1 100644
--- a/en/startstop.xml
+++ b/en/startstop.xml
@@ -114,6 +114,7 @@
     <primary>&name-icinga; command line options</primary>
 
     <secondary>option -d (daemon mode)</secondary>
-<tertiary>&name-icinga; logging options</tertiary>
+<indexterm zone="start_stop">
+    <primary>&name-icinga; logging options</primary>
   </indexterm>
 </section>





More information about the icinga-checkins mailing list