Fix: typo in the create command help and man page

Backported from master. Fixes bug436.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index f773e61f89b7659ad95a5f2a8d9645d3c1ff0864..47cb96659f6940ea3d68546db7eaca8847d058b4 100644 (file)
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
@@ -230,7 +230,7 @@ Using these options, each API call can be controlled individually. For
 instance, \-C does not enable the consumer automatically. You'll need the \-e
 option for that.
 
-\-U, \-\-set-uri=URL
+\-U, \-\-set-url=URL
         Set URL for the enable-consumer destination. It is persistent for the
         session lifetime. Redo the command to change it. This will set both
         data and control URL for network.
@@ -361,7 +361,7 @@ Using these options, each API call can be controlled individually. For
 instance, \-C does not enable the consumer automatically. You'll need the \-e
 option for that.
 
-\-U, \-\-set-uri=URL
+\-U, \-\-set-url=URL
         Set URL for the enable-consumer destination. It is persistent for the
         session lifetime. Redo the command to change it. This will set both
         data and control URL for network.

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 80c5bf1554c929244d776fd71716f2ed494f56b0..fe659d08747394de4d62cd2ea7da8c030513ef26 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -52,9 +52,9 @@ static struct poptOption long_options[] = {
        {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
        {"output", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
        {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
-       {"set-uri",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
-       {"ctrl-uri",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
-       {"data-uri",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
+       {"set-url",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
+       {"ctrl-url",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
+       {"data-url",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
        {"no-consumer",      0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0},
        {"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}

diff --git a/src/bin/lttng/commands/enable_consumer.c b/src/bin/lttng/commands/enable_consumer.c
index 6a635f424bb9c90b0693f6b8a35eb58b7396c371..6b14b16649dbdfa4d698865091551d4a58c1838d 100644 (file)
--- a/src/bin/lttng/commands/enable_consumer.c
+++ b/src/bin/lttng/commands/enable_consumer.c
@@ -55,9 +55,9 @@ static struct poptOption long_options[] = {
        {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_VAL, &opt_userspace, 1, 0, 0},
-       {"set-uri",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
-       {"ctrl-uri",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
-       {"data-uri",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
+       {"set-url",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
+       {"ctrl-url",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
+       {"data-url",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
        {"enable",         'e', POPT_ARG_VAL, &opt_enable, 1, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
@@ -87,7 +87,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "Using these options, each API call can be controlled individually.\n");
        fprintf(ofp, "For instance, -C does not enable the consumer automatically.\n");
        fprintf(ofp, "\n");
-       fprintf(ofp, "  -U, --set-uri=URL    Set URL for the enable-consumer destination.\n");
+       fprintf(ofp, "  -U, --set-url=URL    Set URL for the enable-consumer destination.\n");
        fprintf(ofp, "                       It is persistent for the session lifetime.\n");
        fprintf(ofp, "                       Redo the command to change it.\n");
        fprintf(ofp, "                       This will set both data and control URL for network.\n");