Update documentation

fixes #7564
Icinga · Feb 11, 2015 · 46f7397 · 46f7397
1 parent a15b79f
commit 46f7397
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 430 deletions.
diff --git a/doc/15-migrating-from-icinga-1x.md b/doc/15-migrating-from-icinga-1x.md
@@ -1004,7 +1004,7 @@ With the freely definable custom attributes in Icinga 2 it looks like this:
 The global configuration setting `enable_environment_macros` does not exist in
 Icinga 2.
 
-Macros exported into the [environment](3-monitoring-basics.md#runtime-custom-attribute-env-vars)
+Macros exported into the [environment](#runtime-custom-attribute-env-vars)
 must be set using the `env` attribute in command objects.
 
 #### <a id="differences-1x-2-runtime-macros"></a> Runtime Macros

diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md
@@ -201,7 +201,7 @@ queried for its current status.
       Process: 21674 ExecStartPre=/usr/sbin/icinga2-prepare-dirs /etc/sysconfig/icinga2 (code=exited, status=0/SUCCESS)
      Main PID: 21727 (icinga2)
        CGroup: /system.slice/icinga2.service
-               └─21727 /usr/sbin/icinga2 -c /etc/icinga2/icinga2.conf -d -e /var/log/icinga2/error.log -u icinga -g icinga --no-stack-rlimit
+               21727 /usr/sbin/icinga2 -c /etc/icinga2/icinga2.conf -d -e /var/log/icinga2/error.log -u icinga -g icinga --no-stack-rlimit
 
     Jul 23 13:39:38 nbmif icinga2[21692]: [2014-07-23 13:39:38 +0200] information/ConfigItem: Checked 309 Service(s).
     Jul 23 13:39:38 nbmif icinga2[21692]: [2014-07-23 13:39:38 +0200] information/ConfigItem: Checked 1 User(s).