From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 2 Oct 2013 11:56:50 +0000 (+0200)
Subject: Build fix.
X-Git-Tag: v0.0.3~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04869cf9fee3d7a1eaadc0bd330bcc12ac1ba9f9;p=icinga2

Build fix.
---

diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md
index f3b39b9b0..70dd9093e 100644
--- a/doc/2.1-setting-up-icinga-2.md
+++ b/doc/2.1-setting-up-icinga-2.md
@@ -56,8 +56,8 @@ Here's a brief description of the example config:
      * - this is where you define settings for the Icinga application including
      * which hosts/services to check.
      *
-     * The docs/icinga2-config.adoc file in the source tarball has a detailed
-     * description of what configuration options are available.
+     * For an overview of all available configuration options please refer
+     * to the documentation that is distributed as part of Icinga 2.
      */
 
 Icinga 2 supports [C/C++-style comments](#comments).
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 58edf55b8..4ffdb6180 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,18 +3,25 @@
 EXTRA_DIST = \
 	1-about.md \
 	2.0-getting-started.md \
-	2.1.1-setting-up-icinga-2.md \
-	2.1.2-setting-up-icinga-classic-ui.md \
-	2.1.3-setting-up-check-plugins.md \
-	2.1.4-setting-up-ido.md \
-	2.2-running-icinga.md \
-	2.3-monitoring-basics.md \
-	3.1-configuration-syntax.md \
-	3.2-global-variables.md \
-	3.3-object-types.md \
-	3-configuring-icinga.md \
-	4-icinga-template-library.md \
-	5-advanced-topics.md \
+	2.1-setting-up-icinga-2.md \
+	2.2-setting-up-icinga-classic-ui.md \
+	2.3-setting-up-check-plugins.md \
+	2.4-setting-up-ido.md \
+	2.5-setting-up-livestatus.md \
+	2.6-running-icinga.md \
+	3.1-hosts-and-services.md \
+	3.2-commands.md \
+	3.3-macros.md \
+	3.4-notifications.md \
+	3.5-groups.md \
+	3.5-using-templates.md \
+	3-monitoring-basics.md \
+	4.1-configuration-syntax.md \
+	4.2-global-variables.md \
+	4.3-object-types.md \
+	4-configuring-icinga.md \
+	5-icinga-template-library.md \
+	6-advanced-topics.md \
 	icinga2.8
 
 icinga2docdir = ${docdir}