X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=ecfea53ff4b36121c8f56b0747e66298968b57ba;hb=4fc83d948cea6b10484e65f004a6c167e71ac440;hp=95afcb770ed8537b50aca545ccc6d28ce1eac2c4;hpb=722a6d4500aec66b02ff51863a7d6eeec796edde;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 95afcb770..ecfea53ff 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -33,6 +33,14 @@
 
 #include "command.h"
 
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
+
 /* Variables */
 static char *progname;
 int opt_no_sessiond;
@@ -66,7 +74,6 @@ static struct option long_options[] = {
 /* First level command */
 static struct cmd_struct commands[] =  {
 	{ "add-context", cmd_add_context},
-	{ "calibrate", cmd_calibrate},
 	{ "create", cmd_create},
 	{ "destroy", cmd_destroy},
 	{ "disable-channel", cmd_disable_channels},
@@ -254,7 +261,7 @@ static void show_basic_help(void)
 	puts("  create            " CONFIG_CMD_DESCR_CREATE);
 	puts("  destroy           " CONFIG_CMD_DESCR_DESTROY);
 	puts("  load              " CONFIG_CMD_DESCR_LOAD);
-	puts("  metadata          " CONFIG_CMD_DESCR_METADATA);
+	puts("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
 	puts("  save              " CONFIG_CMD_DESCR_SAVE);
 	puts("  set-session       " CONFIG_CMD_DESCR_SET_SESSION);
 	puts("");
@@ -281,7 +288,6 @@ static void show_basic_help(void)
 	puts("  untrack           " CONFIG_CMD_DESCR_UNTRACK);
 	puts("");
 	puts("Miscellaneous:");
-	puts("  calibrate         " CONFIG_CMD_DESCR_CALIBRATE);
 	puts("  help              " CONFIG_CMD_DESCR_HELP);
 	puts("  version           " CONFIG_CMD_DESCR_VERSION);
 	puts("  view              " CONFIG_CMD_DESCR_VIEW);
@@ -318,10 +324,9 @@ static int parse_args(int argc, char **argv)
 			ret = 0;
 			goto end;
 		case 'h':
-			ret = utils_show_man_page(1, "lttng");
-
+			ret = utils_show_help(1, "lttng", help_msg);
 			if (ret) {
-				ERR("Cannot view man page lttng(1)");
+				ERR("Cannot show --help for `lttng`");
 				perror("exec");
 			}
 			goto end;