Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6

diff --combined contrib/collection3/etc/collection.conf
index b2c1b87,c5a0e9f..86cb3aa
--- 1/contrib/collection3/etc/collection.conf
--- 2/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@@ -434,7 -434,7 +434,7 @@@ GraphWidth 40
    DataSources value
    RRDTitle "Processes on {hostname}"
    RRDVerticalLabel "Processes"
 -  RRDFormat "%5.1lf%s"
 +  RRDFormat "%5.1lf"
    DSName running  Running
    DSName sleeping Sleeping
    DSName paging   Paging
@@@ -498,8 -498,8 +498,8 @@@
    DataSources value
    DSName value Temp
    RRDTitle "Temperature ({instance})"
-   RRDVerticalLabel "°Celsius"
-   RRDFormat "%4.1lf°C"
+   RRDVerticalLabel "°Celsius"
+   RRDFormat "%4.1lf°C"
  </Type>
  <Type users>
    DataSources users
@@@ -525,4 -525,4 +525,4 @@@
    RRDVerticalLabel "W"
    RRDFormat "%4.1lfW"
  </Type>
- # vim: set sw=2 sts=2 et syntax=apache fileencoding=latin-1 :
+ # vim: set sw=2 sts=2 et syntax=apache fileencoding=utf-8 :