Merge branch 'collectd-5.4'

Conflicts:
	src/Makefile.am
	src/write_http.c

diff --cc contrib/redhat/collectd.spec
index 5c7803f4c94364dbe320238b1f9405630740fb42,c6f7a061cda4ddd71e43ecc97e43c856fbfdea98..406ea48b05d5f16bb60f2db4d5e3353c99d86875
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2159,14 -1944,8 +2157,13 @@@ f
  %{_libdir}/%{name}/nut.so
  %endif
  
 +%if %{with_openldap}
 +%files openldap
 +%{_libdir}/%{name}/openldap.so
 +%endif
 +
  %if %{with_perl}
  %files perl
- %doc perl-examples/*
  %{perl_vendorlib}/Collectd.pm
  %{perl_vendorlib}/Collectd/
  %{_mandir}/man3/Collectd::Unixsock.3pm*

diff --cc src/collectd.conf.pod
index 356c6f5a8759838d550e1c28e71b386bdc7e750f,3c599ebdd066138b49d184911c4b8872788c2503..2ee22197cbbdba2343869775a543fc7f7c142b69
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -3150,12 -2800,8 +3150,12 @@@ privileges. See the B<User> documentati
  =item B<SlaveNotifications> I<true|false>
  
  If enabled, the plugin sends a notification if the replication slave I/O and /
- or SQL threads are not running.
+ or SQL threads are not running. Defaults to B<false>.
  
 +=item B<ConnectTimeout> I<Seconds>
 +
 +Sets the connect timeout for the MySQL client.
 +
  =back
  
  =head2 Plugin C<netapp>