Merge branch 'collectd-4.6' into collectd-4.7

diff --cc ChangeLog
Simple merge

diff --cc contrib/collection3/etc/collection.conf
Simple merge

diff --cc src/collectd.conf.pod
index 97093c85d11c8cf69e2bd19c2324abe773ba0a7f,d4f667b7892600d1059afbbd21de4d5a7e61203a..32d877af2b8ba529f5b6b7285d4aba6daed0db7f
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -2591,42 -2241,9 +2591,42 @@@ slashes
  
  =back
  
 +=head2 Plugin C<protocols>
 +
 +Collects a lot of information about various network protocols, such as I<IP>,
 +I<TCP>, I<UDP>, etc.
 +
 +Available configuration options:
 +
 +=over 4
 +
 +=item B<Value> I<Selector>
 +
 +Selects whether or not to select a specific value. The string being matched is
 +of the form "I<Protocol>:I<ValueName>", where I<Protocol> will be used as the
 +plugin instance and I<ValueName> will be used as type instance. An example of
 +the string being used would be C<Tcp:RetransSegs>.
 +
 +You can use regular expressions to match a large number of values with just one
 +configuration option. To select all "extended" I<TCP> values, you could use the
 +following statement:
 +
 +  Value "/^TcpExt:/"
 +
 +Whether only matched values are selected or all matched values are ignored
 +depends on the B<IgnoreSelected>. By default, only matched values are selected.
 +If no value is configured at all, all values will be selected.
 +
 +=item B<IgnoreSelected> B<true>|B<false>
 +
 +If set to B<true>, inverts the selection made by B<Value>, i.E<nbsp>e. all
 +matching values will be ignored.
 +
 +=back
 +
  =head2 Plugin C<rrdcached>
  
- The C<rrdcached> plugin uses the RRDTool accelerator daemon, L<rrdcached(1)>,
+ The C<rrdcached> plugin uses the RRDtool accelerator daemon, L<rrdcached(1)>,
  to store values to RRD files in an efficient manner. The combination of the
  C<rrdcached> B<plugin> and the C<rrdcached> B<daemon> is very similar to the
  way the C<rrdtool> plugin works (see below). The added abstraction layer