Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

	ChangeLog
	configure.in

diff --git a/ChangeLog b/ChangeLog
index 6c9358b..1c6d8c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,6 @@
          (i. e. without quotes).
        * nut plugin: A fix allows linking the nut plugin against
          libupsclient, version >= 2.2.0.
-       * processes plugin: Fix a potential segmentation fault.
 
 2007-07-30, Version 4.0.6
        * sensors plugin: Fix the ignorelist functionality: Only the `type
@@ -93,6 +92,9 @@
          from collectd, parses them and exits according to Nagios-standards.
        * manpages: The manpages have been improved a lot.
 
+2007-08-31, Version 3.11.6
+       * processes plugin: Fix a potential segmentation fault.
+
 2007-05-29, Version 3.11.5
        * configure: Added `AC_SYS_LARGEFILE' for LFS.
        * ntpd plugin: Fix a potential buffer overflow.

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index cd3fc40..879c2c3 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -32,6 +32,10 @@ ignored. Values are either string, enclosed in double-quotes,
 B<false>. String containing of only alphanumeric characters and underscores do
 not need to be quoted.
 
+Please note that B<there is a bug> in the library used by collectd to read the
+configfile, that will lead to all lines with trailing whitespaces to be
+ignored. This problem has been solved in collectdE<nbsp>4.0 and later.
+
 =head1 GLOBAL OPTIONS
 
 =over 4