From 1d00009c03047a4ea841f0efcd3f638b371a47e3 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 7 Oct 2013 15:02:12 +0200
Subject: [PATCH] Update documentation.

---
 doc/3.2-commands.md               |  2 ++
 doc/4.1-configuration-syntax.md   | 17 ++++++++++-------
 etc/icinga2/conf.d/localhost.conf | 18 +++++++++++++++++-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/doc/3.2-commands.md b/doc/3.2-commands.md
index eeb448e1f..6d6a0d8d0 100644
--- a/doc/3.2-commands.md
+++ b/doc/3.2-commands.md
@@ -1,3 +1,5 @@
 ## Commands
 
+Icinga 2 uses command objects to specify how checks should be performed.
+
 TODO
diff --git a/doc/4.1-configuration-syntax.md b/doc/4.1-configuration-syntax.md
index 53e0d17ac..5d819f57e 100644
--- a/doc/4.1-configuration-syntax.md
+++ b/doc/4.1-configuration-syntax.md
@@ -365,9 +365,8 @@ Example:
 
 > **Note**
 >
-> The `icinga` library is automatically loaded at startup.
-
-<!--
+> The `icinga` library is automatically loaded at startup. You don't need
+> to load it manually.
 
 ### Type Definition
 
@@ -413,9 +412,13 @@ The Pizza definition provides the following validation rules:
     validation of the ingredients dictionary.
 
 -   Pizza objects may contain attribute matching the pattern
-    *custom::\** of any type.
+    `custom::*` of any type.
 
-Valid types for type rules include: \* any \* number \* string \* scalar
-(an alias for string) \* dictionary
+Valid types for type rules include:
+
+* any
+* number
+* string
+* scalar (an alias for string)
+* dictionary
 
--->
diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index 778f1113d..0fa783e97 100644
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -3,36 +3,52 @@
  * in the conf.d directory (e.g. one per host). By default all *.conf
  * files in this directory are included.
  */
-object Host "localhost" {
+object Host "localhost" inherits "generic-host" {
   services["ping4"] = {
+    templates = [ "generic-service" ],
+
     check_command = "ping4"
   },
 
   services["ping6"] = {
+    templates = [ "generic-service" ],
+
     check_command = "ping6"
   },
 
   services["http"] = {
+    templates = [ "generic-service" ],
+
     check_command = "http_ip"
   },
 
   services["ssh"] = {
+    templates = [ "generic-service" ],
+
     check_command = "ssh"
   },
 
   services["load"] = {
+    templates = [ "generic-service" ],
+
     check_command = "load"
   },
 
   services["processes"] = {
+    templates = [ "generic-service" ],
+
     check_command = "processes"
   },
 
   services["users"] = {
+    templates = [ "generic-service" ],
+
     check_command = "users"
   },
 
   services["disk"] = {
+    templates = [ "generic-service" ],
+
     check_command = "disk"
   },