Merge branch 'collectd-5.4' into collectd-5.5

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 729aa03..36eca9c 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -84,7 +84,7 @@
 # Lines beginning with a single `#' belong to plugins which have been built  #
 # but are disabled by default.                                               #
 #                                                                            #
-# Lines begnning with `##' belong to plugins which have not been built due   #
+# Lines beginning with `##' belong to plugins which have not been built due  #
 # to missing dependencies or because they have been deactivated explicitly.  #
 ##############################################################################
 
@@ -484,7 +484,6 @@
 #      FSType "ext3"
 #      IgnoreSelected false
 #      ReportByDevice false
-#      ReportReserved false
 #      ReportInodes false
 #      ValuesAbsolute true
 #      ValuesPercentage false
@@ -573,6 +572,7 @@
 
 #<Plugin iptables>
 #      Chain table chain
+#      Chain6 table chain
 #</Plugin>
 
 #<Plugin irq>