From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 18 Mar 2016 12:03:37 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~34
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15;hp=2cf10557f58144e13793a3d69ae5d4b7c8d6c305;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/collectd-exec.pod b/src/collectd-exec.pod
index 0e4cd53a..654db408 100644
--- a/src/collectd-exec.pod
+++ b/src/collectd-exec.pod
@@ -94,7 +94,7 @@ I<Valuelist> is a colon-separated list of the time and the values, each either
 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).
+epoch (i.E<nbsp>e. standard UNIX time) or B<N> to use the current time.
 
 You can mix options and values, but the order is important: Options only
 effect following values, so specifying an option as last field is allowed, but