From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sun, 23 Nov 2014 15:37:06 +0000 (-0500)
Subject: Docs: Add -f/--config option to lttng-sessiond man page
X-Git-Tag: v2.5.3~30
X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=02425e05073412f9e6f18e29662be361f30464f5

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 3af537f5b..c9cffb88a 100644
--- 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 db8fa6762..a569c0415 100644
--- 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");
 }