Merge branch 'collectd-5.5'

diff --cc src/collectd.conf.pod
index 9e57f87f2fc3b149966295a9bd6a87dddd211f25,e5a5c754327b84c507bf7531ed31eebf6c67a9e3..24dc59dbfd019c89e2359fb54ba7167d225ba7e8
--- 1/src/collectd.conf.pod
--- 2/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