Improve lttng.c usage()

Signed-off-by: Daniel Thibault <daniel.thibault@drdc-rddc.gc.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index aeaad1469725db898871c6a644f1b2a00119d8a7..e60b694e43729ab1c7ced011e11c2cae3a5e5433 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -82,23 +82,23 @@ static struct cmd_struct commands[] =  {
 static void usage(FILE *ofp)
 {
        fprintf(ofp, "LTTng Trace Control " VERSION"\n\n");
-       fprintf(ofp, "usage: lttng [options] <command>\n");
+       fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -h, --help             Show this help\n");
-       fprintf(ofp, "  -g, --group NAME       Unix tracing group name. (default: tracing)\n");
-       fprintf(ofp, "  -v, --verbose          Verbose mode\n");
+       fprintf(ofp, "      --list-options     Simple listing of lttng options\n");
+       fprintf(ofp, "      --list-commands    Simple listing of lttng commands\n");
+       fprintf(ofp, "  -v, --verbose          Increase verbosity\n");
        fprintf(ofp, "  -q, --quiet            Quiet mode\n");
+       fprintf(ofp, "  -g, --group NAME       Unix tracing group name. (default: tracing)\n");
        fprintf(ofp, "  -n, --no-sessiond      Don't spawn a session daemon\n");
        fprintf(ofp, "      --sessiond-path    Session daemon full path\n");
-       fprintf(ofp, "      --list-options     Simple listing of lttng options\n");
-       fprintf(ofp, "      --list-commands    Simple listing of lttng commands\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Commands:\n");
-       fprintf(ofp, "    add-context     Add context to event or/and channel\n");
+       fprintf(ofp, "    add-context     Add context to event and/or channel\n");
        fprintf(ofp, "    calibrate       Quantify LTTng overhead\n");
        fprintf(ofp, "    create          Create tracing session\n");
-       fprintf(ofp, "    destroy         Teardown tracing session\n");
+       fprintf(ofp, "    destroy         Tear down tracing session\n");
        fprintf(ofp, "    enable-channel  Enable tracing channel\n");
        fprintf(ofp, "    enable-event    Enable tracing event\n");
        fprintf(ofp, "    disable-channel Disable tracing channel\n");