CONTRIBUTING.md: Improve wording around ChangeLog; fix example.

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 09ad826..bb31e02 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -5333,8 +5333,9 @@ When configuring with B<Interface> only the basic statistics will be collected,
 namely octets, packets, and errors. These statistics are collected by
 the C<interface> plugin, too, so using both at the same time is no benefit.
 
-When configured with B<VerboseInterface> all counters B<except> the basic ones,
-so that no data needs to be collected twice if you use the C<interface> plugin.
+When configured with B<VerboseInterface> all counters B<except> the basic ones
+will be collected, so that no data needs to be collected twice if you use the
+C<interface> plugin.
 This includes dropped packets, received multicast packets, collisions and a
 whole zoo of differentiated RX and TX errors. You can try the following command
 to get an idea of what awaits you:
@@ -9356,6 +9357,16 @@ When B<metadata> is used in B<HostnameFormat> or B<PluginInstanceFormat>, this
 describes where the hostname is located in the libvirt metadata. The default is
 I</instance/name/text()>.
 
+=item B<ReportBlockDevices> B<true>|B<false>
+
+Enabled by default. Allows to disable stats reporting of block devices for
+whole plugin.
+
+=item B<ReportNetworkInterfaces> B<true>|B<false>
+
+Enabled by default. Allows to disable stats reporting of network interfaces for
+whole plugin.
+
 =item B<ExtraStats> B<string>
 
 Report additional extra statistics. The default is no extra statistics, preserving
@@ -9417,23 +9428,23 @@ dispatched.
 How many read instances you want to use for this plugin. The default is one,
 and the sensible setting is a multiple of the B<ReadThreads> value.
 
-This option is only useful then domains are specially tagged.
+This option is only useful when domains are specially tagged.
 If you are not sure, just use the default setting.
 
-The reader instance will only query the domains with attached a matching tag.
-Tags should have the form of 'virt-X' where X is reader instance number,
+The reader instance will only query the domains with attached matching tag.
+Tags should have the form of 'virt-X' where X is the reader instance number,
 starting from 0.
 
 The special-purpose reader instance #0, guaranteed to be always present,
 will query all the domains with missing or unrecognized tag, so no domain will
-ever left out.
+ever be left out.
 
-Domain tagging is done with custom attribute in the libvirt domain metadata
-section. Value is taken by XPath I</domain/metadata/ovirtmap/tag/text()>
-expression in I<http://ovirt.org/ovirtmap/tag/1.0> namespace.
+Domain tagging is done with a custom attribute in the libvirt domain metadata
+section. Value is selected by an XPath I</domain/metadata/ovirtmap/tag/text()>
+expression in the I<http://ovirt.org/ovirtmap/tag/1.0> namespace.
 (XPath and namespace values are not configurable yet).
 
-Tagging could be used by management application to evenly spread the
+Tagging could be used by management applications to evenly spread the
 load among the reader threads, or to pin on the same threads all
 the libvirt domains which use the same shared storage, to minimize
 the disruption in presence of storage outages.