Documentation: Fix duplicate installation path table.

Refs #5619

diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md
index e4436af3e0789d2b7baa45295fdea52c7d139722..d861a5cb510da9f1a697e0bd0cf2096f5f7d6608 100644 (file)
--- a/doc/2.1-setting-up-icinga-2.md
+++ b/doc/2.1-setting-up-icinga-2.md
@@ -59,7 +59,8 @@ By default Icinga 2 uses the following files and directories:
   /var/run/icinga2                    | PID file.
   /var/run/icinga2/cmd                | Command pipe and Livestatus socket.
   /var/cache/icinga2                  | Performance data files and status.dat/objects.cache.
-  /var/lib/icinga2                    | The Icinga 2 state file.
+  /var/spool/icinga2                  | Used for performance data spool files.
+  /var/lib/icinga2                    | Icinga 2 state file, cluster feature replay log and configuration files.
   /var/log/icinga2                    | Log file location and compat/ directory for the CompatLogger feature.
 
 ### <a id="icinga2-conf"></a> icinga2.conf

diff --git a/doc/2.6-running-icinga-2.md b/doc/2.6-running-icinga-2.md
index 960dcb864ade18bae5b768f49a872a267c2efdc7..0c3eca0bf051b6fb5c8ff1c4b0776e0bd0be30ed 100644 (file)
--- a/doc/2.6-running-icinga-2.md
+++ b/doc/2.6-running-icinga-2.md
@@ -115,25 +115,3 @@ You can disable features using the `icinga2-disable-feature` command:
 > The `icinga2-enable-feature` and `icinga2-disable-feature` commands do not restart Icinga 2.
 
 
-### <a id="runtime-locations"></a> Runtime Locations
-
-This list describes the default package installation locations. Additional subdirectories
-may be required.
-These paths may differ depending on your installation method, or changed
-[global constants](#global-constants) regarding path settings.
-
-  Name                                  | Description
-  --------------------------------------|--------------------------
-  /etc/icinga2                          | Icinga 2 configuration.
-  /usr/sbin/icinga2*                    | Icinga 2 daemon and feature enable/disable scripts.
-  /usr/bin/icinga2*                     | Helper scripts for Icinga 2.
-  /var/cache/icinga2                    | Runtime files written such as status files.
-  /var/lib/icinga2                      | Icinga 2 state file, cluster feature replay log and configuration files.
-  /var/log/icinga2                      | Used for application, debug and compat log files.
-  /var/spool/icinga2                    | Used for performance data spool files.
-  /var/run/icinga2                      | Runtime data such as PID file, or ExternalCommandListener/LivestatusListener pipes/sockets.
-  /usr/lib/icinga2                      | Icinga 2 Libraries.
-  /usr/share/icinga2                    | [ITL](#itl) and [certificate helpers](#cluster).
-  /usr/share/doc/icinga2*               | This documentation.
-
-

diff --git a/doc/6-advanced-topics.md b/doc/6-advanced-topics.md
index 9905b06e8790fbaac72695c6daeee293089b05e6..e6b0a7a9bf0b9c26a386a8e826258c103dd558c4 100644 (file)
--- a/doc/6-advanced-topics.md
+++ b/doc/6-advanced-topics.md
@@ -332,11 +332,6 @@ the Icinga 2 daemon.
 
     # icinga2 -c /etc/icinga2/node1/icinga2.conf -DIcingaLocalStateDir=/opt/node1/var
 
-> **Note**
->
-> You are required to ship the same directory layout known from a default
-> Icinga 2 installation. Details in [Runtime Locations](#runtime-locations).
-
 ## <a id="dependencies"></a> Dependencies
 
 Icinga 2 uses host and service dependencies as attribute directly on the host or