Merge branch 'collectd-4.5'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 4963a06..28004af 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -168,6 +168,7 @@ FQDNLookup   true
 #              Name "*.conf"
 #              MTime "-5m"
 #              Size "+10k"
+#              Recursive true
 #      </Directory>
 #</Plugin>
 
@@ -179,6 +180,13 @@ FQDNLookup   true
 #
 #              Action NoWrite
 #      </RegEx>
+#
+#      <RegEx>
+#              Plugin "^sensors$"
+#              PluginInstance "^Some Weird Sensor Chip Name Prefix"
+#
+#              SubstitutePluginInstance "foo"
+#      </RegEx>
 #</Plugin>
 
 @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>