From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Jun 2016 06:19:12 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~216
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7b64cc91d3307179557b25b6ece2349a088f4294;p=collectd.git

Merge branch 'collectd-5.5'
---

7b64cc91d3307179557b25b6ece2349a088f4294
diff --cc src/collectd.conf.pod
index 9e57f87f,e5a5c754..24dc59db
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -4662,24 -4303,9 +4662,24 @@@ Default: C<Collectd notify: %s@%s
  
  =back
  
 +=head2 Plugin C<notify_nagios>
 +
 +The I<notify_nagios> plugin writes notifications to Nagios' I<command file> as
 +a I<passive service check result>.
 +
 +Available configuration options:
 +
 +=over 4
 +
 +=item B<CommandFile> I<Path>
 +
 +Sets the I<command file> to write to. Defaults to F</usr/local/nagios/var/rw/nagios.cmd>.
 +
 +=back
 +
  =head2 Plugin C<ntpd>
  
- The C<ntpd> plugin collects per-peer ntpd data such as time offset and time
+ The C<ntpd> plugin collects per-peer ntp data such as time offset and time
  dispersion.
  
  For talking to B<ntpd>, it mimics what the B<ntpdc> control program does on