Update documentation.

diff --git a/doc/2.1.1-setting-up-icinga-2.md b/doc/2.1.1-setting-up-icinga-2.md
index 4637dc6d0da28f1cb7c60eb0e00ee7247d0a5503..fe0c642ee26ad422a98e8feb4fc9e8c6f33eba11 100644 (file)
--- a/doc/2.1.1-setting-up-icinga-2.md
+++ b/doc/2.1.1-setting-up-icinga-2.md
@@ -104,7 +104,9 @@ to define global macros which are available in all command definitions.
 The *conf.d/localhost.conf* file contains our first host definition:
 
     /**
-     * Our first host.
+     * A host definition. You can create your own configuration files
+     * in the conf.d directory (e.g. one per host). By default all *.conf
+     * files in this directory are included.
      */
     object Host "localhost" {
       services["ping4"] = {

diff --git a/doc/3.3-object-types.md b/doc/3.3-object-types.md
index 14aab07c189b6b657000382c87952d2a2751bd58..f46bf0778caf84ae54d27f6b0565424e57ea80b6 100644 (file)
--- a/doc/3.3-object-types.md
+++ b/doc/3.3-object-types.md
@@ -6,7 +6,9 @@ A host.
 
 > **Note**
 >
-> Unlike in Icinga 1.x hosts are not checkable objects in Icinga 2.
+> Unlike in Icinga 1.x hosts are not checkable objects in Icinga 2. Instead
+> hosts inherit their state from the service that is specified using the *check*
+> attribute.
 
 Example:
 

diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index fa810ec4592397e8249f5cfd3c748ddb2b328fb7..795cfb9af36d5930bc823c8d0493b27a180a965e 100644 (file)
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -1,5 +1,7 @@
 /**
- * Out first host.
+ * A host definition. You can create your own configuration files
+ * in the conf.d directory (e.g. one per host). By default all *.conf
+ * files in this directory are included.
  */
 object Host "localhost" {
   services["ping4"] = {