Merge branch 'mg/jitter'

diff --combined src/collectd.conf.pod
index b31bb87,7ab2172..49a3b78
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -1832,11 -1832,6 +1832,11 @@@ multicast, and IPv4 and IPv6 packets. T
  That means that multicast packets will be sent with a TTL of C<1> (one) on most
  operating systems.
  
 +=item B<MaxPacketSize> I<1024-65535>
 +
 +Set the maximum size for datagrams received over the network. Packets larger
 +than this will be truncated.
 +
  =item B<Forward> I<true|false>
  
  If set to I<true>, write packets that were received via the network plugin to
@@@ -2790,7 -2785,7 +2790,7 @@@ matching values will be ignored
  
  =head2 Plugin C<rrdcached>
  
 -The C<rrdcached> plugin uses the RRDTool accelerator daemon, L<rrdcached(1)>,
 +The C<rrdcached> plugin uses the RRDtool accelerator daemon, L<rrdcached(1)>,
  to store values to RRD files in an efficient manner. The combination of the
  C<rrdcached> B<plugin> and the C<rrdcached> B<daemon> is very similar to the
  way the C<rrdtool> plugin works (see below). The added abstraction layer
@@@ -2842,7 -2837,7 +2842,7 @@@ expected. Default is B<true>
  
  You can use the settings B<StepSize>, B<HeartBeat>, B<RRARows>, and B<XFF> to
  fine-tune your RRD-files. Please read L<rrdcreate(1)> if you encounter problems
 -using these settings. If you don't want to dive into the depths of RRDTool, you
 +using these settings. If you don't want to dive into the depths of RRDtool, you
  can safely ignore these settings.
  
  =over 4
@@@ -2939,6 -2934,14 +2939,14 @@@ updates per second, writing all values 
  "collection3" you'll end up with a responsive and fast system, up to date
  graphs and basically a "backup" of your values every hour.
  
+ =item B<RandomTimeout> I<Seconds>
+ 
+ When set, the actual timeout for each value is chosen randomly between
+ I<CacheTimeout>-I<RandomTimeout> and I<CacheTimeout>+I<RandomTimeout>. The
+ intention is to avoid high load situations that appear when many values timeout
+ at the same time. This is especially a problem shortly after the daemon starts,
+ because all values were added to the internal cache at roughly the same time.
+ 
  =back
  
  =head2 Plugin C<sensors>