AUTHORS

@@ -100,6 +100,7 @@ Lars Engels <lars.engels@0x20.net>
 Lars Krüger <krueger-lars@web.de>
 Leah Oswald <mail@leahoswald.de>
 Lee Clemens <java@leeclemens.net>
+Lee Garrett <lgarrett@rocketjump.eu>
 Lennart Betz <lennart.betz@icinga.com>
 Leon Stringer <leon@priorsvle.com>
 Louis Sautier <sautier.louis@gmail.com>

CHANGELOG.md

 # Icinga 2.x CHANGELOG
 
+## 2.10.4 (2019-03-19)
+
+### Notes
+
+* Fix TLS connections in Influxdb/Elasticsearch features leaking file descriptors (#6989 #7018 ref/IP/12219)
+* Fixes for delayed and one-time notifications (#5561 #6757)
+* Improve performance for downtimes/comments added in HA clusters (#6885 ref/IP/9235)
+* check_perfmon supports non-localized performance counter names (#5546 #6418)
+
+### Enhancement
+
+* [#6732](https://github.com/icinga/icinga2/issues/6732) (Windows, PR): Update Windows Agent with new design
+* [#6729](https://github.com/icinga/icinga2/issues/6729) (Windows): Polish the Windows Agent design
+* [#6418](https://github.com/icinga/icinga2/issues/6418) (Windows): check\_perfmon.exe: Add fallback support for localized performance counters
+
+### Bug
+
+* [#7020](https://github.com/icinga/icinga2/issues/7020) (Elasticsearch, PR): ElasticsearchWriter: don't leak sockets
+* [#7018](https://github.com/icinga/icinga2/issues/7018) (Elasticsearch): ElasticsearchWriter not closing SSL connections on  Icinga2 2.10.3.1
+* [#6991](https://github.com/icinga/icinga2/issues/6991) (CLI, PR): PkiUtility::NewCa\(\): just warn if the CA files already exist
+* [#6990](https://github.com/icinga/icinga2/issues/6990) (InfluxDB, PR): InfluxdbWriter: don't leak sockets
+* [#6989](https://github.com/icinga/icinga2/issues/6989) (InfluxDB): InfluxdbWriter not closing connections Icinga2 2.10.3 CentOS 7
+* [#6976](https://github.com/icinga/icinga2/issues/6976) (Cluster, PR): Don't require OS headers to provide SO\_REUSEPORT
+* [#6896](https://github.com/icinga/icinga2/issues/6896) (Notifications, PR): Notification\#BeginExecuteNotification\(\): SetNextNotification\(\) correctly
+* [#6885](https://github.com/icinga/icinga2/issues/6885) (API, Configuration, PR): Don't run UpdateObjectAuthority for Comments and Downtimes
+* [#6800](https://github.com/icinga/icinga2/issues/6800) (Plugins, Windows, PR): Fix check\_perfmon to support non-localized names
+* [#6757](https://github.com/icinga/icinga2/issues/6757) (Notifications, PR): Fix that no\_more\_notifications gets reset when Recovery notifications are filtered away
+* [#5561](https://github.com/icinga/icinga2/issues/5561) (Notifications): Set the notification mode times.begin is not 0, the first notification has a delay
+* [#5546](https://github.com/icinga/icinga2/issues/5546) (Plugins, Windows): check\_perfmon.exe doesn't support cyrillic names of perf counters
+
+### Documentation
+
+* [#7033](https://github.com/icinga/icinga2/issues/7033) (Documentation, PR): Docs: Update supported package repos in Getting Started chapter
+* [#7028](https://github.com/icinga/icinga2/issues/7028) (Documentation, PR): Fix heading level in development chapter
+* [#7001](https://github.com/icinga/icinga2/issues/7001) (Documentation, PR): Assignment operators doc: tell what the { } are for
+* [#6995](https://github.com/icinga/icinga2/issues/6995) (Documentation, PR): Typo and link fix
+* [#6979](https://github.com/icinga/icinga2/issues/6979) (Documentation, PR): Doc: write systemd lower-case
+* [#6975](https://github.com/icinga/icinga2/issues/6975) (Documentation, PR): Fix nested hostgroup example
+* [#6949](https://github.com/icinga/icinga2/issues/6949) (Documentation, PR): Doc fix: update check\_rbl parameter
+* [#6708](https://github.com/icinga/icinga2/issues/6708) (Documentation, PR): Docs: Alpine needs 'edge/main' repository too
+* [#5430](https://github.com/icinga/icinga2/issues/5430) (Documentation): Documentation about dictionaries and assignements
+
+### Support
+
+* [#7032](https://github.com/icinga/icinga2/issues/7032) (code-quality, PR): Backport Defer class for 2.10
+* [#7030](https://github.com/icinga/icinga2/issues/7030) (Packages, PR): SELinux: add unreserved\_port\_type attribute to icinga2\_port\_t
+* [#7029](https://github.com/icinga/icinga2/issues/7029) (Packages): Add unreserved\_port\_type attribute to icinga2\_port\_t
+* [#7002](https://github.com/icinga/icinga2/issues/7002) (Plugins, Windows, PR): check\_network -h: drop non-existent feature
+* [#6987](https://github.com/icinga/icinga2/issues/6987) (Tests): base-base\_utility/comparepasswords\_issafe test fails on i386
+* [#6977](https://github.com/icinga/icinga2/issues/6977) (Tests, PR): Ignore failure of unit test base\_utility/comparepasswords\_issafe
+
 ## 2.10.3 (2019-02-26)
 
 ### Notes

RELEASE.md

@@ -26,7 +26,7 @@
 Specify the release version.
 
 ```
-VERSION=2.10.2
+VERSION=2.10.4
 ```
 
 Add your signing key to your Git configuration file, if not already there.
@@ -162,17 +162,19 @@ git checkout release && git pull
 Set the `Version`, `Revision` and `changelog` inside the spec file.
 
 ```
+VERSION=2.10.4
+
 sed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
 
 vim icinga2.spec
 
 %changelog
-* Tue Jul 17 2018 Michael Friedrich <michael.friedrich@icinga.com> 2.9.0-1
-- Update to 2.9.0
+* Tue Mar 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.4-1
+- Update to 2.10.4
 ```
 
 ```
-git commit -av -m "Release 2.9.0-1"
+git commit -av -m "Release $VERSION-1"
 git push
 ```
 
@@ -211,20 +213,19 @@ git checkout release && git pull
 
 #### Release Commit
 
-Set the `Version`, `Revision` and `changelog` inside the spec file.
+Set the `Version`, `Revision` and `changelog` by using the `dch` helper.
 
 ```
-./dch 2.9.0-1 "Update to 2.9.0"
+VERSION=2.10.4
+
+./dch $VERSION-1 "Update to $VERSION"
 ```
 
 ```
-git commit -av -m "Release 2.9.0-1"
+git commit -av -m "Release $VERSION-1"
 git push
 ```
 
-```
-git commit -av -m "Release 2.9.0-1"
-```
 
 **Note for major releases**: Update release branch to latest.
 
@@ -241,7 +242,7 @@ git checkout master && git pull && git cherry-pick release && git push
 #### DEB with dch on macOS
 
 ```
-docker run -v `pwd`:/mnt/packaging -ti ubuntu:xenial bash
+docker run -v `pwd`:/mnt/packaging -ti ubuntu:bionic bash
 
 apt-get update && apt-get install git ubuntu-dev-tools vim -y
 cd /mnt/packaging
@@ -249,7 +250,9 @@ cd /mnt/packaging
 git config --global user.name "Michael Friedrich"
 git config --global user.email "michael.friedrich@icinga.com"
 
-./dch 2.10.0-1 "Update to 2.10.0"
+VERSION=2.10.4
+
+./dch $VERSION-1 "Update to $VERSION"
 ```
 
 
@@ -354,7 +357,7 @@ git merge testing
 git push
 ```
 
-SSH into icinga-web1 and do a manual Puppet run from the production environment (default).
+SSH into icinga-web2 and do a manual Puppet run from the production environment (default).
 
 ```
 puppet agent -t
@@ -362,9 +365,9 @@ puppet agent -t
 
 ### Announcement  <a id="announcement"></a>
 
-* Create a new blog post on icinga.com/blog
-* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
-* Update IRC channel topic
+* Create a new blog post on [icinga.com/blog](https://icinga.com/blog) including a featured image
+* Create a release topic on [community.icinga.com](https://community.icinga.com)
+* Release email to team
 
 ### Project Management  <a id="project-management"></a>
 

VERSION

-Version: 2.10.3
+Version: 2.10.4
 Revision: 1

debian/changelog

+icinga2 (2.10.4-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Add Icinga GmbH to copyright holders.
+  * Drop comparepasswords_issafe.patch, included upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 22 Mar 2019 06:56:49 +0100
+
 icinga2 (2.10.3-2) unstable; urgency=medium
 
   * Team upload.

debian/copyright

@@ -4,6 +4,7 @@ Source: https://github.com/Icinga/icinga2
 
 Files: *
 Copyright: 2012-2018, Icinga Development Team (https://icinga.com)
+                2012, Icinga GmbH
 License: GPL-2+ with OpenSSL exception
 
 Files: etc/icinga2/scripts/mail-host-notification.sh

debian/patches/comparepasswords_issafe.patch

-Description: Ignore failure of unit test base_utility/comparepasswords_issafe
- as volatile system load may cause false negatives
-Author: "Alexander A. Klimov" <alexander.klimov@icinga.com>
-Origin: https://github.com/Icinga/icinga2/pull/6977/commits/646feb76e06155f908a4dcee51144db8f05a114f
-Bug: https://github.com/Icinga/icinga2/issues/6987
-
---- a/test/base-utility.cpp
-+++ b/test/base-utility.cpp
-@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(comparepasswords_is
- 	auto duration2 (steady_clock::now() - start2);
- 
- 	double diff = (double)duration_cast<microseconds>(duration1).count() / (double)duration_cast<microseconds>(duration2).count();
--	BOOST_CHECK(0.9 <= diff && diff <= 1.1);
-+	BOOST_WARN(0.9 <= diff && diff <= 1.1);
- }
- 
- BOOST_AUTO_TEST_SUITE_END()

debian/patches/series

 21_config_changes
 postgres-checkcommand.patch
-comparepasswords_issafe.patch

doc/02-getting-started.md

@@ -13,13 +13,21 @@ First off you have to install Icinga 2. The preferred way of doing this
 is to use the official package repositories depending on which operating system
 and distribution you are running.
 
+Official repositories ([support matrix](https://icinga.com/support/details/)):
+
   Distribution            | Repository
   ------------------------|---------------------------
   Debian                  | [Icinga Repository](https://packages.icinga.com/debian/)
   Ubuntu                  | [Icinga Repository](https://packages.icinga.com/ubuntu/)
+  Raspbian		  | [Icinga Repository](https://packages.icinga.com/raspbian/)
   RHEL/CentOS             | [Icinga Repository](https://packages.icinga.com/epel/)
   openSUSE                | [Icinga Repository](https://packages.icinga.com/openSUSE/)
   SLES                    | [Icinga Repository](https://packages.icinga.com/SUSE/)
+
+Community repositories:
+
+  Distribution            | Repository
+  ------------------------|---------------------------
   Gentoo                  | [Upstream](https://packages.gentoo.org/package/net-analyzer/icinga2)
   FreeBSD                 | [Upstream](https://www.freshports.org/net-mgmt/icinga2)
   OpenBSD                 | [Upstream](http://ports.su/net/icinga/core2,-main)
@@ -34,13 +42,21 @@ available. Please contact your distribution packagers.
 You need to add the Icinga repository to your package management configuration.
 The following commands must be executed with `root` permissions unless noted otherwise.
 
+#### Debian/Ubuntu/Raspbian Repositories <a id="package-repositories-debian-ubuntu-raspbian"></a>
+
 Debian:
 
 ```
 apt-get -y install apt-transport-https
 
 wget -O - https://packages.icinga.com/icinga.key | apt-key add -
-echo 'deb https://packages.icinga.com/debian icinga-stretch main' >/etc/apt/sources.list.d/icinga.list
+
+DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \
+ echo "deb https://packages.icinga.com/debian icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
+ echo "deb-src https://packages.icinga.com/debian icinga-${DIST} main" >> \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
+
 apt-get update
 ```
 
@@ -50,60 +66,50 @@ Ubuntu:
 apt-get -y install apt-transport-https
 
 wget -O - https://packages.icinga.com/icinga.key | apt-key add -
-echo 'deb https://packages.icinga.com/ubuntu icinga-xenial main' >/etc/apt/sources.list.d/icinga.list
-apt-get update
-```
 
-RHEL/CentOS 7:
+. /etc/os-release; if [ ! -z ${UBUNTU_CODENAME+x} ]; then DIST="${UBUNTU_CODENAME}"; else DIST="$(lsb_release -c| awk '{print $2}')"; fi; \
+ echo "deb https://packages.icinga.com/ubuntu icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
+ echo "deb-src https://packages.icinga.com/ubuntu icinga-${DIST} main" >> \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
 
-```
-yum install https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm
+apt-get update
 ```
 
-RHEL/CentOS 6:
+Raspbian:
 
 ```
-yum install https://packages.icinga.com/epel/icinga-rpm-release-6-latest.noarch.rpm
-```
-
-Fedora 27:
+apt-get -y install apt-transport-https
 
-```
-dnf install https://packages.icinga.com/fedora/icinga-rpm-release-27-latest.noarch.rpm
-```
+wget -O - https://packages.icinga.com/icinga.key | apt-key add -
 
-Fedora 26:
+DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \
+ echo "deb https://packages.icinga.com/raspbian icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/icinga.list
+ echo "deb-src https://packages.icinga.com/raspbian icinga-${DIST} main" >> \
+ /etc/apt/sources.list.d/icinga.list
 
-```
-dnf install https://packages.icinga.com/fedora/icinga-rpm-release-26-latest.noarch.rpm
+apt-get update
 ```
 
-SLES 12:
+#### RHEL/CentOS/Fedora Repositories <a id="package-repositories-rhel-centos-fedora"></a>
 
-```
-zypper ar https://packages.icinga.com/SUSE/ICINGA-release.repo
-zypper ref
-```
-
-SLES 11:
+RHEL/CentOS 7:
 
 ```
-zypper ar https://packages.icinga.com/SUSE/ICINGA-release-11.repo
-zypper ref
+yum install https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm
 ```
 
-openSUSE:
+RHEL/CentOS 6:
 
 ```
-zypper ar https://packages.icinga.com/openSUSE/ICINGA-release.repo
-zypper ref
+yum install https://packages.icinga.com/epel/icinga-rpm-release-6-latest.noarch.rpm
 ```
 
-Alpine Linux:
+Fedora 29:
 
 ```
-echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
-apk update
+dnf install https://packages.icinga.com/fedora/icinga-rpm-release-29-latest.noarch.rpm
 ```
 
 #### RHEL/CentOS EPEL Repository <a id="package-repositories-rhel-epel"></a>
@@ -126,6 +132,35 @@ subscription-manager repos --enable rhel-7-server-optional-rpms
 subscription-manager repos --enable rhel-6-server-optional-rpms
 ```
 
+#### SLES/OpenSUSE Repositories <a id="package-repositories-sles-opensuse"></a>
+
+SLES 15/12:
+
+```
+rpm --import https://packages.icinga.com/icinga.key
+
+zypper ar https://packages.icinga.com/SUSE/ICINGA-release.repo
+zypper ref
+```
+
+SLES 11:
+
+```
+rpm --import https://packages.icinga.com/icinga.key
+
+zypper ar https://packages.icinga.com/SUSE/ICINGA-release-11.repo
+zypper ref
+```
+
+openSUSE:
+
+```
+rpm --import https://packages.icinga.com/icinga.key
+
+zypper ar https://packages.icinga.com/openSUSE/ICINGA-release.repo
+zypper ref
+```
+
 #### SLES Security Repository <a id="package-repositories-sles-security"></a>
 
 The packages for SLES 11 depend on the `openssl1` package which is distributed
@@ -136,7 +171,15 @@ as part of the [SLES 11 Security Module](https://www.suse.com/communities/conver
 Icinga 2 requires the `libboost_chrono1_54_0` package from the `SLES 12 SDK` repository. Refer to the SUSE Enterprise
 Linux documentation for further information.
 
-#### Alpine Linux Notes  <a id="package-repositories-alpine-notes"></a>
+#### Alpine Linux Repositories <a id="package-repositories-alpine"></a>
+
+Alpine Linux:
+
+```
+echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
+echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
+apk update
+```
 
 The example provided assumes that you are running Alpine edge, which is the -dev branch and is a rolling release.
 If you are using a stable version please "pin" the edge repository on the latest Icinga 2 package version.
@@ -155,20 +198,20 @@ Debian/Ubuntu:
 apt-get install icinga2
 ```
 
-RHEL/CentOS 6:
+RHEL/CentOS 7 and Fedora:
 
 ```
 yum install icinga2
-chkconfig icinga2 on
-service icinga2 start
+systemctl enable icinga2
+systemctl start icinga2
 ```
 
-RHEL/CentOS 7 and Fedora:
+RHEL/CentOS 6:
 
 ```
 yum install icinga2
-systemctl enable icinga2
-systemctl start icinga2
+chkconfig icinga2 on
+service icinga2 start
 ```
 
 SLES/openSUSE:
@@ -215,8 +258,8 @@ By default Icinga 2 uses the following files and directories:
   Path                                		| Description
   ----------------------------------------------|------------------------------------
   /etc/icinga2                        		| Contains Icinga 2 configuration files.
-  /usr/lib/systemd/system/icinga2.service 	| The Icinga 2 Systemd service file on systems using Systemd.
-  /etc/systemd/system/icinga2.service.d/limits.conf | On distributions with Systemd >227, additional service limits are required.
+  /usr/lib/systemd/system/icinga2.service 	| The Icinga 2 systemd service file on systems using systemd.
+  /etc/systemd/system/icinga2.service.d/limits.conf | On distributions with systemd >227, additional service limits are required.
   /etc/init.d/icinga2                 		| The Icinga 2 init script on systems using SysVinit or OpenRC.
   /usr/sbin/icinga2                   		| Shell wrapper for the Icinga 2 binary.
   /usr/lib\*/icinga2				| Libraries and the Icinga 2 binary (use `find /usr -type f -name icinga2` to locate the binary path).
@@ -268,7 +311,7 @@ SLES/OpenSUSE          | monitoring-plugins | [server:monitoring](https://build.
 Debian/Ubuntu          | monitoring-plugins | -                         | /usr/lib/nagios/plugins
 FreeBSD                | monitoring-plugins | -                         | /usr/local/libexec/nagios
 Alpine Linux           | monitoring-plugins | -                         | /usr/lib/monitoring-plugins
-OS X                   | nagios-plugins     | [MacPorts](https://www.macports.org), [Homebrew](https://brew.sh) | /opt/local/libexec or /usr/local/sbin
+macOS                  | monitoring-plugins | [MacPorts](https://www.macports.org), [Homebrew](https://brew.sh) | /opt/local/libexec or /usr/local/sbin
 
 The recommended way of installing these standard plugins is to use your
 distribution's package manager.
@@ -286,9 +329,7 @@ yum install nagios-plugins-all
 ```
 
 The packages for RHEL/CentOS depend on other packages which are distributed
-as part of the [EPEL repository](https://fedoraproject.org/wiki/EPEL). Please
-make sure to enable this repository by following
-[these instructions](https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
+as part of the [EPEL repository](#package-repositories-rhel-epel).
 
 Fedora:
 
@@ -335,10 +376,10 @@ to determine where to find the plugin binaries.
 
 ### Systemd Service <a id="systemd-service"></a>
 
-Some distributions (e.g. Fedora, openSUSE and RHEL/CentOS 7) use Systemd. The
-Icinga 2 packages automatically install the necessary Systemd unit files.
+Some distributions (e.g. Fedora, openSUSE and RHEL/CentOS 7) use systemd. The
+Icinga 2 packages automatically install the necessary systemd unit files.
 
-The Icinga 2 Systemd service can be (re-)started, reloaded, stopped and also
+The Icinga 2 systemd service can be (re-)started, reloaded, stopped and also
 queried for its current status.
 
 ```
@@ -387,7 +428,7 @@ If you're stuck with configuration errors, you can manually invoke the
 
 > **Tip**
 >
-> If you are running into fork errors with Systemd enabled distributions,
+> If you are running into fork errors with systemd enabled distributions,
 > please check the [troubleshooting chapter](15-troubleshooting.md#check-fork-errors).
 
 ### Init Script <a id="init-script"></a>
@@ -578,16 +619,6 @@ systemctl start mariadb
 mysql_secure_installation
 ```
 
-RHEL/CentOS 6:
-
-```
-yum install mysql-server mysql
-chkconfig mysqld on
-service mysqld start
-
-mysql_secure_installation
-```
-
 SUSE:
 
 ```
@@ -717,15 +748,6 @@ Debian/Ubuntu:
 apt-get install postgresql
 ```
 
-RHEL/CentOS 6:
-
-```
-yum install postgresql-server postgresql
-chkconfig postgresql on
-service postgresql initdb
-service postgresql start
-```
-
 RHEL/CentOS 7:
 
 ```
@@ -902,14 +924,6 @@ systemctl enable httpd
 systemctl start httpd
 ```
 
-RHEL/CentOS 6:
-
-```
-yum install httpd
-chkconfig httpd on
-service httpd start
-```
-
 SUSE:
 
 ```

doc/08-advanced-topics.md

@@ -437,12 +437,12 @@ Icinga 2 supports optional detection of hosts and services that are "flapping".
 
 Flapping occurs when a service or host changes state too frequently, which would result in a storm of problem and
 recovery notifications. With flapping detection enabled a flapping notification will be sent while other notifications are
-suppresed until it calms down after receiving the same status from checks a few times. Flapping detection can help detect
+suppressed until it calms down after receiving the same status from checks a few times. Flapping detection can help detect
 configuration problems (wrong thresholds), troublesome services or network problems.
 
 Flapping detection can be enabled or disabled using the `enable_flapping` attribute.
 The `flapping_threshold_high` and `flapping_threshold_low` attributes allows to specify the thresholds that control
-when a [host](09-object-types.md#objecttype-host) or [service](objecttype-service) is considered to be flapping.
+when a [host](09-object-types.md#objecttype-host) or [service](09-object-types.md#objecttype-service) is considered to be flapping.
 
 The default thresholds are 30% for high and 25% for low. If the computed flapping value exceeds the high threshold a
 host or service is considered flapping until it drops below the low flapping threshold.

doc/15-troubleshooting.md

@@ -498,7 +498,7 @@ Solution:
 
 ### Check Fork Errors <a id="check-fork-errors"></a>
 
-Newer versions of Systemd on Linux limit spawned processes for
+Newer versions of systemd on Linux limit spawned processes for
 services.
 
 * v227 introduces the `TasksMax` setting to units which allows to specify the spawned process limit.
@@ -506,7 +506,7 @@ services.
 * v231 changes the default value to 15%
 
 This can cause problems with Icinga 2 in large environments with many
-commands executed in parallel starting with Systemd v228. Some distributions
+commands executed in parallel starting with systemd v228. Some distributions
 also may have changed the defaults.
 
 The error message could look like this:
@@ -534,16 +534,16 @@ An example is available inside the GitHub repository in [etc/initsystem](https:/
 External Resources:
 
 * [Fork limit for cgroups](https://lwn.net/Articles/663873/)
-* [Systemd changelog](https://github.com/systemd/systemd/blob/master/NEWS)
+* [systemd changelog](https://github.com/systemd/systemd/blob/master/NEWS)
 * [Icinga 2 upstream issue](https://github.com/Icinga/icinga2/issues/5611)
-* [Systemd upstream discussion](https://github.com/systemd/systemd/issues/3211)
+* [systemd upstream discussion](https://github.com/systemd/systemd/issues/3211)
 
 ### Systemd Watchdog <a id="check-systemd-watchdog"></a>
 
 Usually Icinga 2 is a mission critical part of infrastructure and should be
 online at all times. In case of a recoverable crash (e.g. OOM) you may want to
-restart Icinga 2 automatically. With Systemd it is as easy as overriding some
-settings of the Icinga 2 Systemd service by creating
+restart Icinga 2 automatically. With systemd it is as easy as overriding some
+settings of the Icinga 2 systemd service by creating
 `/etc/systemd/system/icinga2.service.d/override.conf` with the following
 content:
 
@@ -557,12 +557,12 @@ Using the watchdog can also help with monitoring Icinga 2, to activate and use i
 
     WatchdogSec=30s
 
-This way Systemd will kill Icinga 2 if does not notify for over 30 seconds, a timout of less than 10 seconds is not
+This way systemd will kill Icinga 2 if does not notify for over 30 seconds, a timout of less than 10 seconds is not
 recommended. When the watchdog is activated, `Restart=` can be set to `watchdog` to restart Icinga 2 in the case of a
 watchdog timeout.
 
 Run `systemctl daemon-reload && systemctl restart icinga2` to apply the changes.
-Now Systemd will always try to restart Icinga 2 (except if you run
+Now systemd will always try to restart Icinga 2 (except if you run
 `systemctl stop icinga2`). After three failures in ten seconds it will stop
 trying because you probably have a problem that requires manual intervention.
 

doc/16-upgrading-icinga-2.md

@@ -145,7 +145,7 @@ sane compile-time defaults.
 > your changes.
 
 There is a bug with existing sysconfig files where path variables are not expanded
-because Systemd [does not support](https://github.com/systemd/systemd/issues/2123)
+because systemd [does not support](https://github.com/systemd/systemd/issues/2123)
 shell variable expansion. This worked with SysVInit though.
 
 Edit the sysconfig file and either remove everything, or edit this line
@@ -167,7 +167,7 @@ vim /etc/sysconfig/icinga2
 ICINGA2_RLIMIT_FILES=50000
 ```
 
-Restart Icinga 2 afterwards, the Systemd service file automatically puts the
+Restart Icinga 2 afterwards, the systemd service file automatically puts the
 value into the application's environment where this is read on startup.
 
 ### Setup Wizard Changes <a id="upgrading-to-2-9-setup-wizard-changes"></a>

doc/17-language-reference.md

@@ -252,7 +252,7 @@ A list of available functions is available in the [Library Reference](18-library
 
 In addition to the `=` operator shown above a number of other operators
 to manipulate attributes are supported. Here's a list of all
-available operators:
+available operators (the outermost `{` `}` stand for a local variable scope):
 
 ### Operator = <a id="operator-assignment"></a>
 

doc/21-development.md

@@ -634,7 +634,7 @@ vim /usr/local/icinga2/etc/icinga2/conf.d/api-users.conf
 gdb --args /usr/local/icinga2/lib/icinga2/sbin/icinga2 daemon
 ```
 
-##### Debian 9 <a id="development-linux-dev-env-debian"></a>
+#### Debian 9 <a id="development-linux-dev-env-debian"></a>
 
 ```
 apt-get -y install gdb vim git cmake make ccache build-essential libssl-dev libboost-all-dev bison flex default-libmysqlclient-dev libpq-dev libyajl-dev libedit-dev monitoring-plugins
@@ -1099,8 +1099,8 @@ Icinga application using a dist tarball (including notes for distributions):
   - Alpine: boost-dev
 * GNU bison (bison)
 * GNU flex (flex) >= 2.5.35
-* Systemd headers
-  - Only required when using Systemd
+* systemd headers
+  - Only required when using systemd
   - Debian/Ubuntu: libsystemd-dev
   - RHEL/Fedora: systemd-devel
 
@@ -1441,13 +1441,13 @@ Usage: /etc/init.d/icinga2 {start|stop|restart|reload|checkconfig|status}
 
 #### Systemd <a id="development-package-builds-systemd"></a>
 
-If your distribution uses Systemd:
+If your distribution uses systemd:
 
 ```
 systemctl {start|stop|reload|status|enable|disable} icinga2
 ```
 
-In case the distribution is running Systemd >227, you'll also
+In case the distribution is running systemd >227, you'll also
 need to package and install the `etc/initsystem/icinga2.service.limits.conf`
 file into `/etc/systemd/system/icinga2.service.d`.
 

doc/23-migrating-from-icinga-1x.md

@@ -116,11 +116,11 @@ This can be migrated to Icinga 2 and [using group assign](17-language-reference.
 
 
     object HostGroup "hg1" {
+      groups = [ "hg2" ]
       assign where host.name in [ "host1", "host2" ]
     }
 
     object HostGroup "hg2" {
-      groups = [ "hg1" ]
       assign where host.name == "host3"
     }