Merge branch 'collectd-4.3'

diff --combined configure.in
index e3662b765c2286748c162f4a331fcc2ff6595857,952f5c5d12bfd1966c7ce81e17fcd77a0125f63e..d53706dfbb87807975e57b234548c3eb291e8299
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1042,8 -1042,6 +1042,6 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin
  AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library])
  AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes")
  
- with_libstatgrab="yes"
- with_libdevstat="no"
  AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
  [
        if test "x$withval" != "xno" -a "x$withval" != "xyes"
@@@ -2224,7 -2222,6 +2222,7 @@@ AC_PLUGIN([serial],      [$plugin_seria
  AC_PLUGIN([snmp],        [$with_libnetsnmp],   [SNMP querying plugin])
  AC_PLUGIN([swap],        [$plugin_swap],       [Swap usage statistics])
  AC_PLUGIN([syslog],      [$have_syslog],       [Syslog logging plugin])
 +AC_PLUGIN([tail],        [yes],                [Parsing of logfiles])
  AC_PLUGIN([tape],        [$plugin_tape],       [Tape drive statistics])
  AC_PLUGIN([tcpconns],    [$plugin_tcpconns],   [TCP connection statistics])
  AC_PLUGIN([unixsock],    [yes],                [Unixsock communication plugin])
@@@ -2363,7 -2360,6 +2361,7 @@@ Configuration
      snmp  . . . . . . . $enable_snmp
      swap  . . . . . . . $enable_swap
      syslog  . . . . . . $enable_syslog
 +    tail  . . . . . . . $enable_tail
      tape  . . . . . . . $enable_tape
      tcpconns  . . . . . $enable_tcpconns
      unixsock  . . . . . $enable_unixsock

diff --combined src/collectd-unixsock.pod
index 13116bbbd5659582005a149c635d6c746aa83bb4,2339625635a9232152f3824460626428dca9b210..2ae5163e3c91390c2dc1cb614d1b5ac58c244161
--- 1/src/collectd-unixsock.pod
--- 2/src/collectd-unixsock.pod
+++ b/src/collectd-unixsock.pod
@@@ -58,10 -58,7 +58,10 @@@ command for the values that have change
  
  The first line's status number is the number of identifiers returned or less
  than zero if an error occurred. Each of the following lines contains the
 -update time as an epoch value and the identifier, separated by a space.
 +update time as an epoch value and the identifier, separated by a space. The
 +update time is the time of the last value, as provided by the collecting
 +instance and may be very different from the time the server consideres to be
 +"now".
  
  Example:
    -> | LISTVAL
@@@ -86,12 -83,12 +86,12 @@@ plugin within collectd. I<type> identif
  (i.E<nbsp>e. data-set) passed to collectd. A large list of predefined
  data-sets is available in the B<types.db> file.
  
- The I<OptionList> is an optional list of I<Options>, where each option if a
+ The I<OptionList> is an optional list of I<Options>, where each option is a
  key-value-pair. A list of currently understood options can be found below, all
  other options will be ignored.
  
  I<Valuelist> is a colon-separated list of the time and the values, each either
- an integer if the data-source is a counter, of a double if the data-source if
+ an integer if the data-source is a counter, or a double if the data-source is
  of type "gauge". You can submit an undefined gauge-value by using B<U>. When
  submitting B<U> to a counter the behavior is undefined. The time is given as
  epoch (i.E<nbsp>e. standard UNIX time).
@@@ -177,18 -174,6 +177,18 @@@ Example
    -> | PUTNOTIF type=temperature severity=warning time=1201094702 message=The roof is on fire!
    <- | 0 Success
  
 +=item B<FLUSH> [B<timeout=>I<Timeout>] [B<plugin=>I<Plugin> [...]]
 +
 +Flushes all cached data older than I<Timeout> seconds. If no timeout has been
 +specified, it defaults to -1 which causes all data to be flushed.
 +
 +If specified, only specific plugins are flushed. Otherwise all plugins
 +providing a flush callback are flushed.
 +
 +Example:
 +  -> | FLUSH
 +  <- | 0 Done
 +
  =back
  
  =head2 Identifiers