From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 26 Mar 2008 08:52:25 +0000 (+0100)
Subject: Merge branch 'collectd-4.3'
X-Git-Tag: collectd-4.4.0~67
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a2ef6243e563dae68c71d58c1d9af924a5817e5a

Merge branch 'collectd-4.3'

Conflicts:

	src/unixsock.c
---

a2ef6243e563dae68c71d58c1d9af924a5817e5a
diff --cc src/collectd-unixsock.pod
index 7aa7ac7c,3ef24386..971cb36d
--- a/src/collectd-unixsock.pod
+++ b/src/collectd-unixsock.pod
@@@ -214,12 -191,28 +214,14 @@@ some examples
    myhost/memory/memory-used
    myhost/disk-sda/disk_octets
  
 -=head2 Return values
 -
 -Unless otherwise noted the plugin answers with a line of the following form:
 -
 -I<Num> I<Message>
 -
 -If I<Num> is zero the message indicates success, if I<Num> is non-zero the
 -message indicates failure. I<Message> is a human-readable string that describes
 -the return value further.
 -
 -Commands that return values may use I<Num> to return the number of values that
 -follow, such as the B<GETVAL> command. These commands usually return a negative
 -value on failure and never return zero.
 -
  =head1 ABSTRACTION LAYER
  
- Shipped with the sourcecode comes the Perl-Module L<Collectd::Unixsock> which
+ B<collectd> ships the Perl-Module L<Collectd::Unixsock> which
  provides an abstraction layer over the actual socket connection. It can be
- found in the directory F<contrib/PerlLib>. If you want to use Perl to
- communicate with the daemon, you're encouraged to use and expand this module.
+ found in the directory F<bindings/perl/> in the source distribution or
+ (usually) somewhere near F</usr/share/perl5/> if you're using a package. If
+ you want to use Perl to communicate with the daemon, you're encouraged to use
+ and expand this module.
  
  =head1 SEE ALSO