Merge branch 'ff/dns'

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 29035abf72d43b4bcf69dbff608f3346ef4059b3..f74a118539b4192ef0a57dc7a49df4c3b48aac11 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -83,6 +83,23 @@
 #      Process name
 #</Plugin>
 
+## There are two different naming schemes for the sensors plugin, to preserver
+## backwards compatibility. The `extended naming' is prefered, but not the
+## default for this reason. See `collectd.conf(5)' for more information.
+#<Plugin sensors>
+#      ExtendedSensorNaming false
+#      Sensor it8712-temp1
+#      Sensor it8712-fan3
+#      Sensor it8712-in8
+## -- OR --
+#      ExtendedSensorNaming true
+#      Sensor it8712-isa-0290/temperature-temp1
+#      Sensor it8712-isa-0290/fanspeed-fan3
+#      Sensor it8712-isa-0290/voltage-in8
+#
+#      IgnoreSelected false
+#</Plugin>
+
 #<Plugin traffic>
 #      Interface eth0
 #      IgnoreSelected false