[icinga-checkins] icinga.org: icinga-doc/wnieder/index: clean some conflicts

git at icinga.org git at icinga.org
Sun Oct 18 12:43:50 CEST 2009


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

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Thu Oct 15 12:27:15 2009 +0200

clean some conflicts

---

 en/Icinga.xml     |    2 +-
 en/configcgi.xml  |    3 ---
 en/configmain.xml |    3 ---
 en/macrolist.xml  |    3 ---
 4 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/en/Icinga.xml b/en/Icinga.xml
index e72be77..d2e3e9f 100644
--- a/en/Icinga.xml
+++ b/en/Icinga.xml
@@ -199,5 +199,5 @@
 <xi:include href="pluginapi.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="epnplugins.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </chapter>
-
+<index/>
 </book>
diff --git a/en/configcgi.xml b/en/configcgi.xml
index 3ddf04f..2c1a826 100644
--- a/en/configcgi.xml
+++ b/en/configcgi.xml
@@ -1158,8 +1158,6 @@
 
   <para>This option is used to define the base URL to your Splunk interface. This URL is used by the CGIs when creating links if
   the <link linkend="configcgi-enable_splunk_integration">enable_splunk_integration</link> option is enabled.</para>
-<<<<<<< HEAD:en/configcgi.xml
-=======
   <indexterm zone="config_cgi"><primary>CGI Configuration File Options</primary></indexterm>
   <indexterm zone="configcgi-main_cfg_file"><primary>main_cfg_file=</primary><secondary> Main Configuration File Location</secondary></indexterm>
   <indexterm zone="configcgi-physical_html_path"><primary>physical_html_path=</primary><secondary> Physical HTML Path</secondary></indexterm>
@@ -1184,5 +1182,4 @@
   <indexterm zone="configcgi-action_url_target"><primary>action_url_target=</primary><secondary> Action URL Target</secondary></indexterm>
   <indexterm zone="configcgi-enable_splunk_integration"><primary>enable_splunk_integration=</primary><secondary> Splunk Integration Option</secondary></indexterm>
   <indexterm zone="configcgi-splunk_url"><primary>splunk_url=</primary><secondary> Splunk URL</secondary></indexterm>
->>>>>>> c8debcc... more index items added:en/configcgi.xml
 </section>
diff --git a/en/configmain.xml b/en/configmain.xml
index e8a7e4c..7bbfe89 100644
--- a/en/configmain.xml
+++ b/en/configmain.xml
@@ -5249,8 +5249,6 @@
   file grows larger than this size, it will be renamed with a .old extension. If a file already exists with a .old extension it
   will automatically be deleted. This helps ensure your disk space usage doesn't get out of control when debugging
   &name-icinga;.</para>
-<<<<<<< HEAD:en/configmain.xml
-=======
   <indexterm zone="config_main"><primary>Main Configuration File Options</primary></indexterm>
   <indexterm zone="configmain-log_file"><primary>log_file=</primary><secondary> Log File</secondary></indexterm>
   <indexterm zone="configmain-cfg_file"><primary>cfg_file=</primary><secondary> Object Configuration File</secondary></indexterm>
@@ -5379,5 +5377,4 @@
   <indexterm zone="configmain-debug_level"><primary>debug_level=</primary><secondary> Debug Level</secondary></indexterm>
   <indexterm zone="configmain-debug_verbosity"><primary>debug_verbosity=</primary><secondary> Debug Verbosity</secondary></indexterm>
   <indexterm zone="configmain-max_debug_file_size"><primary>max_debug_file_size=</primary><secondary> Maximum Debug File Size</secondary></indexterm>
->>>>>>> c8debcc... more index items added:en/configmain.xml
 </section>
diff --git a/en/macrolist.xml b/en/macrolist.xml
index 32d44b2..c6a56d5 100644
--- a/en/macrolist.xml
+++ b/en/macrolist.xml
@@ -4927,8 +4927,6 @@
   available as environment variables if the <link
   linkend="configmain-use_large_installation_tweaks">use_large_installation_tweaks</link> option is enabled, as they are quite
   CPU-intensive to calculate.</para>
-<<<<<<< HEAD:en/macrolist.xml
-=======
   <indexterm zone="macro_list"><primary>Macros</primary><secondary>Standard Macros in &name-icinga;</secondary></indexterm>
   <indexterm zone="macrolist-summary_macros"><primary>Macros</primary><secondary>Summary Macros</secondary></indexterm>
   <indexterm zone="macrolist-hostname"><primary>$HOSTNAME$</primary></indexterm>
@@ -5234,5 +5232,4 @@
   <indexterm zone="macrolist-adminpager"><primary>$ADMINPAGER$</primary></indexterm>
   <indexterm zone="macrolist-arg"><primary>$ARGn$</primary></indexterm>
   <indexterm zone="macrolist-user"><primary>$USERn$</primary></indexterm>
->>>>>>> c8debcc... more index items added:en/macrolist.xml
 </section>





More information about the icinga-checkins mailing list