[icinga-checkins] icinga.org: icinga-doc/next: make users more aware of config diffs when upgrading (fixes #2608)

git at icinga.org git at icinga.org
Wed Oct 10 18:17:26 CEST 2012


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

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Wed Oct 10 18:08:56 2012 +0200

make users more aware of config diffs when upgrading (fixes #2608)

---

 de/upgrading.xml          |    6 ++++++
 de/upgrading_idoutils.xml |    7 +++++++
 en/upgrading.xml          |    6 ++++++
 en/upgrading_idoutils.xml |    6 ++++++
 4 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/de/upgrading.xml b/de/upgrading.xml
index 406f182..b37a19c 100644
--- a/de/upgrading.xml
+++ b/de/upgrading.xml
@@ -8,6 +8,12 @@
          xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
   <title>&name-icinga; aktualisieren</title>
 
+  <note> 
+    <para>Seit 1.8 finden Sie neue Konfigurationsoptionen, die in einer neuen Version hinzugefügt wurden, in <filename>sample-config/updates/</filename>
+          sowie <filename>module/idoutils/config/updates</filename>, z.B. <filename>cgi.cfg_added_1.7_to_1.8.cfg</filename>.
+    </para>
+  </note>
+
   <indexterm zone="upgrading">
     <primary>Aktualisieren (upgrading)</primary>
   </indexterm>
diff --git a/de/upgrading_idoutils.xml b/de/upgrading_idoutils.xml
index cbb5387..fe69c98 100644
--- a/de/upgrading_idoutils.xml
+++ b/de/upgrading_idoutils.xml
@@ -13,6 +13,13 @@
   Sie den Maintainer, ob er diese Anpassungen in der Installationsroutine hinzugefügt hat.</para>
 
   <note>
+    <para>Seit 1.8 finden Sie neue Konfigurationsoptionen, die in einer neuen Version hinzugefügt wurden, in <filename>module/idoutils/config/updates</filename>,
+    z.B. <filename>ido2db.cfg_added_1.7_to_1.8.cfg</filename>.
+    </para>
+  </note>
+
+
+  <note>
     <para>Abhängig von den Änderungen und der Größe Ihrer Datenbank kann es eine Weile dauern, die Anpassungen durchzuführen. Bitte haben
     Sie ein wenig Geduld und brechen Sie das Script nicht ab, weil sonst ggf. Ihre Daten unbrauchbar sind.</para>
   </note>
diff --git a/en/upgrading.xml b/en/upgrading.xml
index 0812d1e..eeea3c3 100644
--- a/en/upgrading.xml
+++ b/en/upgrading.xml
@@ -9,6 +9,12 @@
   <title><anchor xml:id="upgrading_nagios"/>Upgrading (to) &name-icinga;</title>
 
   <note>
+    <para>Starting with 1.8, you will find newly added config options in version diffed config files in <filename>sample-config/updates/</filename>
+	  as well as <filename>module/idoutils/config/updates</filename>, e.g. <filename>cgi.cfg_added_1.7_to_1.8.cfg</filename>.
+    </para>
+  </note>
+
+  <note>
     <para>If you are using &name-idoutils; then you have to update it, too. Please take a look at <link linkend="upgrading_idoutils">
     upgrading_idoutils</link> as well.</para>
 
diff --git a/en/upgrading_idoutils.xml b/en/upgrading_idoutils.xml
index 1e42e08..be9e25c 100644
--- a/en/upgrading_idoutils.xml
+++ b/en/upgrading_idoutils.xml
@@ -13,6 +13,12 @@
   those modifications to the install routine.</para>
 
   <note>
+    <para>Starting with 1.8, you will find newly added config options in version diffed config files in <filename>module/idoutils/config/updates</filename>
+    e.g. <filename>ido2db.cfg_added_1.7_to_1.8.cfg</filename>.
+    </para>
+  </note>
+
+  <note>
     <para>Depending on the changes to be done and the size of your database it may take a while to update your database. Please try to be
     patient and don't abort the script as it may leave the data being corrupt.</para>
   </note>





More information about the icinga-checkins mailing list