Remove `metadata` command from various help resources

This command is now deprecated. Its own man page remains available
and warns the user that it's deprecated and suggests to look at
lttng-regenerate(1) instead.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 1e86f0fca13e8983dcc01c1bbcb1b6e05c7e8787..8b2decc714aae051d5ee5498a74728bce209e944 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,6 @@ _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ENABLE_EVENT], [Create or enable event ru
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_HELP], [Display help information about a command])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_LIST], [List tracing sessions, domains, channels, and events])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_LOAD], [Load tracing session configurations])
-_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_METADATA], [Manage an LTTng tracing session's metadata generation])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_REGENERATE], [Manage an LTTng tracing session's data regeneration])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_SAVE], [Save tracing session configurations])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_SET_SESSION], [Set current tracing session])

diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
index 9fff98912f073c53efaf844b8d2989ef57095c5c..4d727e74a1c3d3dc9bf511d8ea8015e642393fc1 100644 (file)
--- a/doc/man/asciidoc-attrs.conf.in
+++ b/doc/man/asciidoc-attrs.conf.in
@@ -49,7 +49,6 @@ cmd_descr_enable_event="@CMD_DESCR_ENABLE_EVENT@"
 cmd_descr_help="@CMD_DESCR_HELP@"
 cmd_descr_list="@CMD_DESCR_LIST@"
 cmd_descr_load="@CMD_DESCR_LOAD@"
-cmd_descr_metadata="@CMD_DESCR_METADATA@"
 cmd_descr_regenerate="@CMD_DESCR_REGENERATE@"
 cmd_descr_save="@CMD_DESCR_SAVE@"
 cmd_descr_set_session="@CMD_DESCR_SET_SESSION@"

diff --git a/doc/man/lttng.1.txt b/doc/man/lttng.1.txt
index 23dcc32cb0ef81db4c61e8ae758d80bc1ecc4951..0b7a532f0b4a68d461c1ae7071dd8cea1b0a9136 100644 (file)
--- a/doc/man/lttng.1.txt
+++ b/doc/man/lttng.1.txt
@@ -156,9 +156,6 @@ man:lttng-destroy(1)::
 man:lttng-load(1)::
     {cmd_descr_load}.
 
-man:lttng-metadata(1)::
-    {cmd_descr_metadata}.
-
 man:lttng-regenerate(1)::
     {cmd_descr_regenerate}.
 

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 8cf45410ed28957b0752d8ca05dfde78991114f0..b3ee2428640f945d1b4bf68736f1c2a91469edc0 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -253,7 +253,6 @@ 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);