Merge remote-tracking branch 'github/pr/1067'

diff --combined src/collectd.conf.pod
index 16315ad,05ae8f3..d713667
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -130,6 -130,15 +130,15 @@@ Sets a plugin-specific interval for col
  global B<Interval> setting. If a plugin provides own support for specifying an
  interval, that setting will take precedence.
  
+ =item B<FlushInterval> I<Seconds>
+ 
+ Specifies the the interval, in seconds, to call the flush callback if it's
+ defined in this plugin. By default, this is disabled
+ 
+ =item B<FlushTimeout> I<Seconds>
+ 
+ Specifies the value of the timeout argument of the flush callback.
+ 
  =back
  
  =item B<AutoLoadPlugin> B<false>|B<true>
@@@ -802,22 -811,12 +811,22 @@@ B<apcupsd> can handle it
  
  TCP-Port to connect to. Defaults to B<3551>.
  
 -=item B<ReportSeconds> B<true|false>
 +=item B<ReportSeconds> B<true>|B<false>
  
  If set to B<true>, the time reported in the C<timeleft> metric will be
  converted to seconds. This is the recommended setting. If set to B<false>, the
  default for backwards compatibility, the time will be reported in minutes.
  
 +=item B<PersistentConnection> B<true>|B<false>
 +
 +By default, the plugin will try to keep the connection to UPS open between
 +reads. Since this appears to be somewhat brittle (I<apcupsd> appears to close
 +the connection due to inactivity quite quickly), the plugin will try to detect
 +this problem and switch to an open-read-close mode in such cases.
 +
 +You can instruct the plugin to close the connection after each read by setting
 +this option to B<false>.
 +
  =back
  
  =head2 Plugin C<aquaero>