Merge branch 'vbartoni/df'

diff --combined src/collectd.conf.pod
index 55b964330b41600337cd67e6ed8fa950096cbbbb,97dd8ab2dc0d4c15328d9179693e123e7e489830..6ef2822ec68669d61cb4cebe05d4ae45e4deb975
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -1511,14 -1511,19 +1511,19 @@@ Enable this option if inodes are a scar
  many small files are stored on the disk. This is a usual scenario for mail
  transfer agents and web caches.
  
- =item B<ReportPercentage> B<false>|B<true>
+ =item B<ValuesAbsolute> B<true>|B<false>
  
- Enables or disables reporting of disk space and inodes as a percentage.
- Defaults to B<false>.
+ Enables or disables reporting of free, used and used disk space in 1K-blocks. 
+ Defaults to true.
  
- This is useful for deploying I<collectd> on the cloud, where machines with
- different disk size may exist. Then it is more practical to configure
- thresholds based on relative disk size.
+ =item B<ValuesPercentage> B<true>|B<false>
+ 
+ Enables or disables reporting of free, used and used disk space in percentage.
+ Defaults to false.
+ 
+ This is useful for deploying collectd on the cloud, where machines with
+ different disk size may exist. Then it is more practical to configure thresholds
+ based on relative disk size.
  
  =back
  
@@@ -5837,9 -5842,9 +5842,9 @@@ iptables to feed data for the guest IP
  
  The C<write_graphite> plugin writes data to I<Graphite>, an open-source metrics
  storage and graphing project. The plugin connects to I<Carbon>, the data layer
 -of I<Graphite>, and sends data via the "line based" protocol (per default using
 -portE<nbsp>2003). The data will be sent in blocks of at most 1428 bytes to
 -minimize the number of network packets.
 +of I<Graphite>, via I<TCP> or I<UDP> and sends data via the "line based"
 +protocol (per default using portE<nbsp>2003). The data will be sent in blocks
 +of at most 1428 bytes to minimize the number of network packets.
  
  Synopsis:
  
@@@ -5847,8 -5852,6 +5852,8 @@@
     <Node "example">
       Host "localhost"
       Port "2003"
 +     Protocol "udp"
 +     LogSendErrors true
       Prefix "collectd"
     </Node>
   </Plugin>
@@@ -5866,17 -5869,6 +5871,17 @@@ Hostname or address to connect to. Defa
  
  Service name or port number to connect to. Defaults to C<2003>.
  
 +=item B<Protocol> I<String>
 +
 +Protocol to use when connecting to I<Graphite>. Defaults to C<tcp>.
 +
 +=item B<LogSendErrors> B<false>|B<true>
 +
 +If set to B<true> (the default), logs errors when sending data to I<Graphite>.
 +If set to B<false>, it will not log the errors. This is especially useful when
 +using Protocol UDP since many times we want to use the "fire-and-forget"
 +approach and logging errors fills syslog with unneeded messages.
 +
  =item B<Prefix> I<String>
  
  When set, I<String> is added in front of the host name. Dots and whitespace are