From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Wed, 24 Feb 2016 15:38:30 +0000 (+0700)
Subject: curl_xml: Changed documentation to match proposed changes.
X-Git-Tag: collectd-5.8.0~59^2~8
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d93929779c15349927f84d952bd1789426e80bae

curl_xml: Changed documentation to match proposed changes.
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 44ecd361..05e205f0 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1931,6 +1931,11 @@ host name setting.
 Use I<Instance> as the plugin instance when submitting values. Defaults to an
 empty string (no plugin instance).
 
+=item B<PluginName> I<PluginName>
+
+Use I<PluginName> as the plugin name when submitting values.
+Defaults to 'curl_xml'.
+
 =item B<Namespace> I<Prefix> I<URL>
 
 If an XPath expression references namespaces, they must be specified
@@ -2000,9 +2005,19 @@ Specifies a XPath expression to use for determining the I<type instance>. The
 XPath expression must return exactly one element. The element's value is then
 used as I<type instance>, possibly prefixed with I<InstancePrefix> (see above).
 
-This value is required. As a special exception, if the "base XPath expression"
-(the argument to the B<XPath> block) returns exactly one argument, then this
-option may be omitted.
+=item B<PluginInstanceFrom> I<PluginInstanceFrom>
+
+Specifies a XPath expression to use for determining the I<plugin instance>. The
+XPath expression must return exactly one element. The element's value is then
+used as I<plugin instance>.
+
+=back
+
+If the "base XPath expression" (the argument to the B<XPath> block) returns
+exactly one argument, then I<InstanceFrom> and I<PluginInstanceFrom> may be omitted.
+Otherwise, at least one of I<InstanceFrom> or I<PluginInstanceFrom> is required.
+
+=over 4
 
 =item B<ValuesFrom> I<ValuesFrom> [I<ValuesFrom> ...]