From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Sun, 2 Dec 2018 18:45:11 +0000 (+0700)
Subject: Fix merge issue
X-Git-Tag: collectd-5.9.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab2e1fe96c181ce69f9b85761495e978fa8f0b2;p=thirdparty%2Fcollectd.git

Fix merge issue
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index ae52beea7..0708bf98d 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -9346,12 +9346,6 @@ 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<Instances> B<integer>
-
-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.
-If you are not sure, just use the default setting.
-
 =item B<ExtraStats> B<string>
 
 Report additional extra statistics. The default is no extra statistics, preserving