[icinga-checkins] icinga.org: icinga-doc/master: doc issues #1084, #1092

git at icinga.org git at icinga.org
Fri Jan 14 20:51:52 CET 2011


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

Author: Wolfgang <wnd at gmx.net>
Date:   Fri Jan 14 20:49:52 2011 +0100

doc issues #1084, #1092

---

 de/Icinga.xml        |    8 +++++++-
 de/configcgi.xml     |   35 +++++++++++++++++++++++++++++++++++
 en/Icinga.xml        |    6 ++++--
 en/configcgi.xml     |   37 ++++++++++++++++++++++++++++++++++++-
 ent/version.ent      |    2 +-
 xsl/html-chunked.xsl |    4 ++--
 6 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/de/Icinga.xml b/de/Icinga.xml
index c6f8845..08ca22a 100644
--- a/de/Icinga.xml
+++ b/de/Icinga.xml
@@ -17,11 +17,13 @@
 
     <pubdate>&ver-pubdate;</pubdate>
 
+<!--
     <copyright>
-      <year>2009-2010</year>
+      <year>2009-2011</year>
 
       <holder>Icinga Development Team</holder>
     </copyright>
+-->
 
     <keywordset>
       <keyword>Supervision</keyword>
@@ -34,6 +36,10 @@
     </keywordset>
 
     <legalnotice>
+      <para>Copyright 2009-2011 Icinga Development Team.</para>
+    </legalnotice>
+
+    <legalnotice>
       <para>Portions copyright © by Nagios/Icinga community members - see the THANKS file in the &name-icinga; core sources for more
       information.</para>
 
diff --git a/de/configcgi.xml b/de/configcgi.xml
index b3011d0..446f125 100644
--- a/de/configcgi.xml
+++ b/de/configcgi.xml
@@ -1298,6 +1298,37 @@
     <para>Diese Option ist verfügbar ab &name-icinga; 1.3.</para>
   </note>
 
+  <para><anchor xml:id="configcgi-http_charset" /> <emphasis role="bold">HTTP-Zeichensatz einstellen</emphasis></para>
+
+  <informaltable frame="none">
+    <tgroup cols="2">
+      <colspec colname="c1" colwidth="5*" />
+
+      <colspec colname="c2" colwidth="50*" />
+
+      <tbody>
+        <row>
+          <entry align="left" valign="top"><para>Format:</para></entry>
+
+          <entry><para> <emphasis role="bold">http_charset=<Zeichensatz></emphasis> </para></entry>
+        </row>
+
+        <row>
+          <entry align="left" valign="top"><para>Beispiel:</para></entry>
+
+          <entry><para> <emphasis condition="red" role="color"> <emphasis role="bold">http_charset=utf-8</emphasis> </emphasis>
+          </para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+
+  <para>Hiermit kann der Zeichensatz eingestellt werden, der mit den HTTP-Headern gesendet wird. Default ist utf-8.</para>
+
+  <note>
+    <para>Diese Option ist verfügbar ab &name-icinga; 1.3.</para>
+  </note>
+
   <indexterm zone="configcgi">
     <primary>CGI-Konfiguration</primary>
 
@@ -1483,4 +1514,8 @@
 
     <secondary>Service-Zustand und Benachrichtigungsnummer anzeigen (soft)</secondary>
   </indexterm>
+
+  <indexterm zone="configcgi-http_charset">
+    <primary>http_charset=</primary>
+  </indexterm>
 </section>
diff --git a/en/Icinga.xml b/en/Icinga.xml
index 2cfcf15..cf3809e 100644
--- a/en/Icinga.xml
+++ b/en/Icinga.xml
@@ -23,11 +23,13 @@
 
     <pubdate>&ver-pubdate;</pubdate>
 
+<!--
     <copyright>
-      <year>2009-2010</year>
+      <year>2009-2011</year>
 
       <holder>Icinga Development Team</holder>
     </copyright>
+-->
 
     <keywordset>
       <keyword>Supervision</keyword>
@@ -40,7 +42,7 @@
     </keywordset>
 
     <legalnotice>
-      <para>Copyright 2010 Icinga Development Team.</para>
+      <para>Copyright 2009-2011 Icinga Development Team.</para>
     </legalnotice>
 
     <legalnotice>
diff --git a/en/configcgi.xml b/en/configcgi.xml
index 3e1342f..99d319e 100644
--- a/en/configcgi.xml
+++ b/en/configcgi.xml
@@ -60,7 +60,7 @@
     </listitem>
 
     <listitem>
-      <para><link linkend="configcgi-url_stylesheets_path">URL Stylesheets path</link></para>
+      <para><link linkend="configcgi-url_stylesheet_path">URL Stylesheets path</link></para>
     </listitem>
   </itemizedlist>
 
@@ -1530,6 +1530,37 @@
     <para>These options are available starting with &name-icinga; 1.3.</para>
   </note>
 
+  <para><anchor xml:id="configcgi-http_charset" /> <emphasis role="bold">Set HTTP character set</emphasis></para>
+
+  <informaltable frame="none">
+    <tgroup cols="2">
+      <colspec colname="c1" colwidth="5*" />
+
+      <colspec colname="c2" colwidth="50*" />
+
+      <tbody>
+        <row>
+          <entry align="left" valign="top"><para>Format:</para></entry>
+
+          <entry><para> <emphasis role="bold">http_charset=<char-set></emphasis> </para></entry>
+        </row>
+
+        <row>
+          <entry align="left" valign="top"><para>Example:</para></entry>
+
+          <entry><para> <emphasis condition="red" role="color"> <emphasis role="bold">http_charset=utf-8</emphasis> </emphasis>
+          </para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+
+  <para>This is the character set which is sent with HTTP headers. Default is utf-8.</para>
+
+  <note>
+    <para>This option is available starting with &name-icinga; 1.3.</para>
+  </note>
+
   <indexterm zone="config_cgi">
     <primary>CGI Configuration File Options</primary>
   </indexterm>
@@ -1713,4 +1744,8 @@
 
     <secondary>Show service state and notification number (soft)</secondary>
   </indexterm>
+
+  <indexterm zone="configcgi-http_charset">
+    <primary>http_charset=</primary>
+  </indexterm>
 </section>
diff --git a/ent/version.ent b/ent/version.ent
index 7c90d29..5cd4d3b 100644
--- a/ent/version.ent
+++ b/ent/version.ent
@@ -5,4 +5,4 @@
 <!ENTITY ver-doc "1.2">
 <!ENTITY ver-pubdate "2010.10.06">
 <!ENTITY ver-nagiosplug "1.4.15">
-<!ENTITY ver-mklive "1.1.6p1">
+<!ENTITY ver-mklive "1.1.9p1">
diff --git a/xsl/html-chunked.xsl b/xsl/html-chunked.xsl
index c1e6c5e..d84dd73 100644
--- a/xsl/html-chunked.xsl
+++ b/xsl/html-chunked.xsl
@@ -41,11 +41,11 @@
 
 <!-- 
 <xsl:template name="user.footer.content">
-  <HR/><P class="copyright">&#x00A9; 2009-2010 Icinga Development Team, http://www.icinga.org</P>
+  <HR/><P class="copyright">&#x00A9; 2009-2011 Icinga Development Team, http://www.icinga.org</P>
 </xsl:template>
 -->
 <xsl:template name="user.footer.navigation">
-  <P class="copyright">&#x00A9; 2009-2010 Icinga Development Team, http://www.icinga.org</P>
+  <P class="copyright">&#x00A9; 2009-2011 Icinga Development Team, http://www.icinga.org</P>
 </xsl:template>
 
 </xsl:stylesheet>





More information about the icinga-checkins mailing list