Docs: Add -f/--config option to lttng-sessiond man page

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Conflicts:
	src/bin/lttng-sessiond/main.c

diff --git a/doc/man/lttng-sessiond.8 b/doc/man/lttng-sessiond.8
index 3af537f5bd307ad78cb8ef519647c2244704217a..c9cffb88a50c43c7681becbe15eb05966924c859 100644 (file)
--- a/doc/man/lttng-sessiond.8
+++ b/doc/man/lttng-sessiond.8
@@ -124,6 +124,9 @@ Specify path for the 64-bit UST consumer daemon libraries
 .TP
 .BR "-l, --load PATH
 Specify path from which to automatically load session configuration(s).
+.TP
+.BR "-f, --config PATH
+Specify path from which to load daemon configuration.
 
 .SH "LOADING SESSIONS"
 

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index db8fa6762c4e5b2ff9ea5f4169c7a6eaf4e1ba5f..a569c04155a05fe23e61cc8596028771332c8995 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4216,7 +4216,7 @@ static void usage(void)
        fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
        fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
        fprintf(stderr, "      --jul-tcp-port                 JUL application registration TCP port\n");
-       fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
+       fprintf(stderr, "  -f  --config PATH                  Load daemon configuration file\n");
        fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
        fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
 }