Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index 484b365b4d9787bbf1d6b99e07d7e71c0ff2e52a..99941db93af0d0a5d4436c91bbe230c7d67e70ac 100644 (file)
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
@@ -645,12 +645,17 @@ rather then in mysnapshot*/
 .B LONG OPTIONS
 
 .nf
-\-s, \-\-session NAME   Apply to session name.
-\-n, \-\-name NAME      Name of the snapshot's output.
-\-m, \-\-max-size SIZE  Maximum size in bytes of the snapshot.
-                        The maxium size does not count the metadata file.
-\-C, \-\-ctrl-url URL   Set control path URL. (Must use -D also)
-\-D, \-\-data-url URL   Set data path URL. (Must use -C also)
+\-s, \-\-session NAME
+        Apply to session name.
+\-n, \-\-name NAME
+        Name of the snapshot's output.
+\-m, \-\-max-size SIZE
+        Maximum size in bytes of the snapshot. The maxium size does not
+        include the metadata file.
+\-C, \-\-ctrl-url URL
+        Set control path URL. (Must use -D also)
+\-D, \-\-data-url URL
+        Set data path URL. (Must use -C also)
 .fi
 
 .IP

diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index f58d9516b18c4603bff9f9ddd0d586b953c44bba..e1dea4986c37b25753d86686ee97bb01bd3c7603 100644 (file)
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -76,13 +76,13 @@ static struct cmd_struct actions[] = {
  */
 static void usage(FILE *ofp)
 {
-       fprintf(ofp, "usage: lttng snapshot [ACTION]\n");
+       fprintf(ofp, "usage: lttng snapshot ACTION\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Actions:\n");
        fprintf(ofp, "   add-output [-m <SIZE>] [-s <NAME>] [-n <NAME>] <URL> | -C <URL> -D <URL>\n");
        fprintf(ofp, "      Setup and add an snapshot output for a session.\n");
        fprintf(ofp, "\n");
-       fprintf(ofp, "   del-output ID [-s <NAME>]\n");
+       fprintf(ofp, "   del-output ID | NAME [-s <NAME>]\n");
        fprintf(ofp, "      Delete an output for a session using the ID.\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "   list-output [-s <NAME>]\n");
@@ -91,8 +91,9 @@ static void usage(FILE *ofp)
        fprintf(ofp, "   record [-m <SIZE>] [-s <NAME>] [-n <NAME>] [<URL> | -C <URL> -D <URL>]\n");
        fprintf(ofp, "      Snapshot a session's buffer(s) for all domains. If an URL is\n");
        fprintf(ofp, "      specified, it is used instead of a previously added output.\n");
-       fprintf(ofp, "      The snapshot is saved in the session directory in snapshot/ with\n");
-       fprintf(ofp, "      the top directory being NAME or the default: snapshot-ID/\n");
+       fprintf(ofp, "      Specifying only a name or/a size will override the current output value.\n");
+       fprintf(ofp, "      For instance, you can record a snapshot with a custom maximum size\n");
+       fprintf(ofp, "      or with a different name.\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -h, --help           Show this help\n");