From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 8 Jan 2008 10:23:28 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.4~8
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	src/collectd.conf.pod
---

c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5
diff --cc src/collectd.conf.pod
index 6c600f04,bab709ba..56b258f9
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -32,10 -32,12 +32,16 @@@ ignored. Values are either string, encl
  B<false>. String containing of only alphanumeric characters and underscores do
  not need to be quoted.
  
 +Plugins are loaded in the order listed in this config file. It is a good idea
 +to load any logging plugins first in order to catch messages from plugins
 +during configuration.
 +
+ The configuration is read and processed in order, i.E<nbsp>e. from top to
+ bottom. So the plugins are loaded in the order listed in this config file. It
+ is a good idea to load any logging plugins first in order to catch messages
+ from plugins during configuration. Also, the C<LoadPlugin> option B<must> occur
+ B<before> the C<E<lt>Plugin ...E<gt>> block.
+ 
  =head1 GLOBAL OPTIONS
  
  =over 4