From: Benoît Monin <benoit.monin@gmx.fr>
Date: Sat, 25 Apr 2015 10:02:44 +0000 (+0200)
Subject: rrdupdate: fix options documentation
X-Git-Tag: v1.5.3~5^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402b6314c96a7f65ef1b289886e43ae1ac7bcdd8;p=thirdparty%2Frrdtool-1.x.git

rrdupdate: fix options documentation

* Document skip-past-updates.
* Add short options '-s' and '-d' to rrdtool help.
---

diff --git a/doc/rrdupdate.pod b/doc/rrdupdate.pod
index 58b8cae2..144b2f87 100644
--- a/doc/rrdupdate.pod
+++ b/doc/rrdupdate.pod
@@ -6,6 +6,7 @@ rrdupdate - Store a new set of values into the RRD
 
 B<rrdtool> {B<update> | B<updatev>} I<filename>
 S<[B<--template>|B<-t> I<ds-name>[B<:>I<ds-name>]...]>
+S<[B<--skip-past-updates>|B<-s>]>
 S<[B<--daemon>|B<-d> I<address>]> [B<-->]
 S<B<N>B<:>I<value>[B<:>I<value>]...>
 S<I<timestamp>B<:>I<value>[B<:>I<value>]...>
@@ -62,7 +63,7 @@ for the COMPUTE B<DST>.
 
 The caching daemon L<rrdcached> cannot be used together with templates yet.
 
-=item B<--skip-past-updates>
+=item B<--skip-past-updates>|B<-s>
 
 When updateing an rrd file with data earlier than the latest update already
 applied, rrdtool will issue an error message an abort. This option instructs
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 6e4fa60f..6a2a2207 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -105,8 +105,8 @@ void PrintUsage(
         N_("* update - update an RRD\n\n"
            "\trrdtool update filename\n"
            "\t\t[--template|-t ds-name:ds-name:...]\n"
-           "\t\t[--skip-past-updates]\n"
-	   "\t\t[--daemon <address>]\n"
+           "\t\t[--skip-past-updates|-s]\n"
+	   "\t\t[--daemon|-d <address>]\n"
            "\t\ttime|N:value[:value...]\n\n"
            "\t\tat-time@value[:value...]\n\n"
            "\t\t[ time:value[:value...] ..]\n");
@@ -116,7 +116,7 @@ void PrintUsage(
            "\treturns information about values, RRAs, and datasources updated\n\n"
            "\trrdtool updatev filename\n"
            "\t\t[--template|-t ds-name:ds-name:...]\n"
-           "\t\t[--skip-past-updates]\n"
+           "\t\t[--skip-past-updates|-s]\n"
            "\t\ttime|N:value[:value...]\n\n"
            "\t\tat-time@value[:value...]\n\n"
            "\t\t[ time:value[:value...] ..]\n");