curl_xml: Updated documentation and default configuration

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 655910d9cbaa85d2561a1e5408ded87862cb9d1c..3287e0d1c6017ecfb3d74843a36a77816e6f85ad 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -466,6 +466,7 @@
 #<Plugin curl_xml>
 #  <URL "http://localhost/stats.xml">
 #    Host "my_host"
+#    #Plugin "stats"
 #    Instance "some_instance"
 #    User "collectd"
 #    Password "thaiNg0I"
@@ -480,6 +481,7 @@
 #      Type "magic_level"
 #      #InstancePrefix "prefix-"
 #      InstanceFrom "td[1]"
+#      #PluginInstanceFrom "td[1]"
 #      ValuesFrom "td[2]/span[@class=\"level\"]"
 #    </XPath>
 #  </URL>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index ee7902c08a4abd01ab0e23dca419678906f19916..51cea1156e85c15013dff8240a9b91c393ff4b92 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1927,17 +1927,17 @@ Within the B<URL> block the following options are accepted:
 Use I<Name> as the host name when submitting values. Defaults to the global
 host name setting.
 
+=item B<Plugin> I<Plugin>
+
+Use I<Plugin> as the plugin name when submitting values.
+Defaults to 'curl_xml'.
+
 =item B<Instance> I<Instance>
 
 Use I<Instance> as the plugin instance when submitting values.
 May be overridden by B<PluginInstanceFrom> option inside B<XPath> blocks.
 Defaults to an empty string (no plugin instance).
 
-=item B<Plugin> I<Plugin>
-
-Use I<Plugin> 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
@@ -2028,6 +2028,7 @@ number of XPath expressions must match the number of data sources in the
 I<type> specified with B<Type> (see above). Each XPath expression must return
 exactly one element. The element's value is then parsed as a number and used as
 value for the appropriate value in the value list dispatched to the daemon.
+This option is required.
 
 =back