From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 1 Oct 2013 13:59:25 +0000 (+0200)
Subject: Update documentation.
X-Git-Tag: v0.0.3~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=897315781214a96dee245fc907ddbee20ee47008;p=icinga2

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 4637dc6d0..fe0c642ee 100644
--- 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 14aab07c1..f46bf0778 100644
--- 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 fa810ec45..795cfb9af 100644
--- 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"] = {