[icinga-checkins] icinga.org: icinga2/next: Documentation: Fix formatting.

[git at icinga.org]

Module: icinga2
Branch: next
Commit: 62ee130a2f368a25ee7c8eabfc13b3ec33cf76fe
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=62ee130a2f368a25ee7c8eabfc13b3ec33cf76fe

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Jun  4 22:38:12 2014 +0200

Documentation: Fix formatting.

Refs #6380

---

 doc/8-migration.md |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/doc/8-migration.md b/doc/8-migration.md
index 7803191..d1eccef 100644
--- a/doc/8-migration.md
+++ b/doc/8-migration.md
@@ -477,6 +477,9 @@ Assign the notification escalation to the service `dep_svc01` on all hosts in th
       assign where service.name == "dep_svc01" && "hg_svcdep2" in host.groups
     }
 
+The assign rule could be made more generic and the notification be applied to more than
+just this service belonging to hosts in the matched hostgroup.
+
 
 > **Note**
 >
@@ -548,28 +551,28 @@ Map the dependency attributes accordingly.
 
 And migrate the host and services.
 
-  object Host "host1" {
-    import "linux-server-template"
-    address = "192.168.1.10"
-  }
+    object Host "host1" {
+      import "linux-server-template"
+      address = "192.168.1.10"
+    }
 
-  object HostGroup "hg_svcdep2" {
-    assign where host.name == "host2"
-  }
+    object HostGroup "hg_svcdep2" {
+      assign where host.name == "host2"
+    }
 
-  apply Service "dep_svc01" {
-    import "generic-service"
-    check_command = "test2"
+    apply Service "dep_svc01" {
+      import "generic-service"
+      check_command = "test2"
 
-    assign where "hp_svcdep1" in host.groups
-  }
+      assign where "hp_svcdep1" in host.groups
+    }
 
-  apply Service "dep_svc02" {
-    import "generic-service"
-    check_command = "test2"
+    apply Service "dep_svc02" {
+      import "generic-service"
+      check_command = "test2"
 
-    assign where "hp_svcdep2" in host.groups
-  }
+      assign where "hp_svcdep2" in host.groups
+    }
 
 When it comes to the `execution_failure_criteria` and `notification_failure_criteria` attribute migration,
 you will need to map the most common values, in this example `u,c` (`Unknown` and `Critical` will cause the
@@ -641,7 +644,6 @@ below:
 When migrating to Icinga 2, the parents must be changed to a newly created host dependency.
 
 
-
 Map the following attributes
 
   Icinga 1.x            | Icinga 2
@@ -650,6 +652,8 @@ Map the following attributes
   dependent_host_name   | child_host_name (used in assign/ignore)
   dependent_hostgroup_name | all child hosts in group (used in assign/ignore)
 
+The Icinga 2 configuration looks like this:
+
 
     object Host "vmware-master" {
       import "linux-server-template"