rrdxport: fix options documentation and parsing

* Document short option '-d' for daemon.
* Add enumds option to documentation synopsis.
* Add daemon to rrdtool help.

diff --git a/doc/rrdxport.pod b/doc/rrdxport.pod
index e08fae9e89a6cd9e640145c5bde1db00662826e7..1e71a170b088eabc3eecf64c38755a1f11d75b97 100644 (file)
--- a/doc/rrdxport.pod
+++ b/doc/rrdxport.pod
@@ -10,7 +10,8 @@ S<[B<-e>|B<--end> I<seconds>]>
 S<[B<-m>|B<--maxrows> I<rows>]>
 S<[B<--step> I<value>]>
 S<[B<--json>]>
-S<[B<--daemon> I<address>]>
+S<[B<--enumds>]>
+S<[B<--daemon>|B<-d> I<address>]>
 S<[B<DEF:>I<vname>B<=>I<rrd>B<:>I<ds-name>B<:>I<CF>]>
 S<[B<CDEF:>I<vname>B<=>I<rpn-expression>]>
 S<[B<XPORT>B<:>I<vname>[B<:>I<legend>]]>
@@ -50,7 +51,7 @@ for details.
 
 See L<rrdgraph> documentation.
 
-=item B<--daemon> I<address>
+=item B<--daemon>|B<-d> I<address>
 
 Address of the L<rrdcached> daemon. If specified, a C<flush> command is sent
 to the server before reading the RRD files. This allows B<rrdtool> to return

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 6a2a2207538b10a109fb0eda3edd961bca9910f3..63df770d260e9964ebe2b11fb33a5940437b4d0e 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -228,7 +228,9 @@ void PrintUsage(
         N_("* xport - generate XML dump from one or several RRD\n\n"
            "\trrdtool xport [-s|--start seconds] [-e|--end seconds]\n"
            "\t\t[-m|--maxrows rows]\n" "\t\t[--step seconds]\n"
-           "\t\t[--enumds] [--json]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n"
+           "\t\t[--enumds] [--json]\n"
+           "\t\t[-d|--daemon address]\n"
+           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
            "\t\t[CDEF:vname=rpn-expression]\n"
            "\t\t[XPORT:vname:legend]\n");
     const char *help_quit =