Merge branch 'collectd-5.5' into collectd-5.6

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index d03e64b..4c0a84c 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -3115,6 +3115,12 @@ Defaults to false.
 
 =back
 
 
 =back
 

+=head2 Plugin C<lua>
+
+This plugin embeds a Lua interpreter into collectd and provides an interface
+to collectd's plugin system. See L<collectd-lua(5)> for its documentation.
+
+

 =head2 Plugin C<mbmon>
 
 The C<mbmon plugin> uses mbmon to retrieve temperature, voltage, etc.
 =head2 Plugin C<mbmon>
 
 The C<mbmon plugin> uses mbmon to retrieve temperature, voltage, etc.


@@ -9378,7 +9384,7 @@ Available options:
 
 =item B<TypeInstance> I<String>
 
 
 =item B<TypeInstance> I<String>
 

-=item B<MetaDataSet> I<String> I<String>
+=item B<MetaData> I<String> I<String>

 
 Set the appropriate field to the given string. The strings for plugin instance
 and type instance may be empty, the strings for host and plugin may not be
 
 Set the appropriate field to the given string. The strings for plugin instance
 and type instance may be empty, the strings for host and plugin may not be