From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 12 Mar 2015 17:47:52 +0000 (+0100)
Subject: Remove more references to the Globals option
X-Git-Tag: collectd-5.5.0~12^2~11^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5e75e531a8930317afc13ea0049a466e7d54b127;p=collectd.git

Remove more references to the Globals option

This is a follow up to commit 5eabeb9248

At this point, the last reference to Globals in the doc & examples is
the detailed explanation in collectd.conf(5).
---

diff --git a/src/collectd-perl.pod b/src/collectd-perl.pod
index d5369b4f..d4137bb7 100644
--- a/src/collectd-perl.pod
+++ b/src/collectd-perl.pod
@@ -27,12 +27,6 @@ for collectd in Perl. This is a lot more efficient than executing a
 Perl-script every time you want to read a value with the C<exec plugin> (see
 L<collectd-exec(5)>) and provides a lot more functionality, too.
 
-When loading the C<perl plugin>, the B<Globals> option should be enabled.
-Else, the perl plugin will fail to load any Perl modules implemented in C,
-which includes, amongst many others, the B<threads> module used by the plugin
-itself. See the documentation of the B<Globals> option in L<collectd.conf(5)>
-for details.
-
 =head1 CONFIGURATION
 
 =over 4
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f9d011fc..cbffad30 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -122,18 +122,14 @@
 #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
 #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
 #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
-#@BUILD_PLUGIN_PERL_TRUE@<LoadPlugin perl>
-#@BUILD_PLUGIN_PERL_TRUE@  Globals true
-#@BUILD_PLUGIN_PERL_TRUE@</LoadPlugin>
+#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
 #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
 #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
 #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
 #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
 #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols
-#@BUILD_PLUGIN_PYTHON_TRUE@<LoadPlugin python>
-#@BUILD_PLUGIN_PYTHON_TRUE@  Globals true
-#@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
+#@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
 #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
 #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
 #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 5f9538b7..4ef35589 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -78,7 +78,6 @@ affecting the behavior of B<LoadPlugin> may be specified. The following
 options are allowed inside a B<LoadPlugin> block:
 
   <LoadPlugin perl>
-    Globals true
     Interval 10
   </LoadPlugin>