Merge branch 'master' into fix/small-documentation-fix

diff --cc doc/08-advanced-topics.md
index d514448d40407b468e66d139c3b54642ba8a63b2,ffa62495b8f021af785c5d7c4cec7c2553ff00f7..a5060ba7eae9bee4da17f418a6082b38b9713c67
--- 1/doc/08-advanced-topics.md
--- 2/doc/08-advanced-topics.md
+++ b/doc/08-advanced-topics.md
@@@ -415,8 -415,8 +415,9 @@@ Example output in Icinga Web 2
  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 enabled a flapping notification will be sent while other notifications are
- suppressed until it calms down after receiving the same status from checks a few times. flapping can help detecting
+ 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
++
  configuration problems (wrong thresholds), troublesome services, or network problems.
  
  Flapping detection can be enabled or disabled using the `enable_flapping` attribute.