X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=doc%2Fman%2Flttng-sessiond.8;h=8c29e61ccd69871d9fc4c9c3ec2b34b6f7244cdd;hp=782a9bb18f65ba20707158caf1dbca2aaaaa518b;hb=c0fdca17a0132494a6750ddcbf4f8e076f7366ea;hpb=cf53c06d8c89926284a15f6c27d60cf31761e622

diff --git a/doc/man/lttng-sessiond.8 b/doc/man/lttng-sessiond.8
index 782a9bb18..8c29e61cc 100644
--- a/doc/man/lttng-sessiond.8
+++ b/doc/man/lttng-sessiond.8
@@ -36,14 +36,17 @@ them when the time has come. The user don't need to manage the lttng-consumerd.
 .SH "OPTIONS"
 
 .PP
-This program follow the usual GNU command line syntax with long options starting with
-two dashes. Below is a summary of the available options.
+This program follows the usual GNU command line syntax with long options starting
+with two dashes. Below is a summary of the available options.
 .PP
 
 .TP
 .BR "-h, --help"
 Show summary of possible options and commands
 .TP
+.BR "\-V, \-\-version"
+Show version.
+.TP
 .BR "-v, --verbose"
 Increase verbosity
 
@@ -78,14 +81,20 @@ No output at all.
 .BR "    --no-kernel"
 No kernel tracer support
 .TP
-.BR "    --jul-tcp-port"
-JUL application registration TCP port (default: 5345)
+.BR "    --agent-tcp-port"
+Agent application registration TCP port (default: 5345)
 .TP
 .BR "    --kmod-probes=probe1, probe2, ..."
 Specify the kernel modules containing LTTng probes to load by the session daemon.
 Only the component name of the probe needs to be specified, e.g. to load the
 lttng-probe-irq and lttng-probe-sched use: --kmod-probes="irq, sched".
 .TP
+.BR "    --extra-kmod-probes=probe1, probe2, ..."
+Specify extra kernel modules containing LTTng probes to be loaded by the session
+daemon. The list follows the format of the \fB--kmod-probes\fP option.
+This list is appended to the list provided by \fB--kmod-probes\fP or, if
+\fB--kmod-probes\fP is missing, to the default list of probes.
+.TP
 .BR "-c, --client-sock=PATH"
 Specify path for the client unix socket
 .TP
@@ -124,6 +133,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"
 
@@ -134,7 +146,7 @@ wide one in \fB/etc/lttng/sessions/auto/\fP. Note that the directory containing
 the session's configuration and lttng-sessiond MUST have the same UID for them
 to be automatically loaded.
 
-Specifiying a path with \-l, \-\-load PATH overrides the default directory and
+Specifying a path with \-l, \-\-load PATH overrides the default directory and
 UID check. The lttng-sessiond will simply check if it's accessible and try to
 load every session file in it.
 .PP
@@ -153,10 +165,10 @@ override this variable.
 Specify the 64-bit consumer binary path. \fB--consumerd64-path\fP
 override this variable.
 .IP "LTTNG_CONSUMERD32_LIBDIR"
-Specifiy the 64-bit library path containing libconsumer.so.
+Specify the 64-bit library path containing libconsumer.so.
 \fB--consumerd32-libdir\fP override this variable.
 .IP "LTTNG_CONSUMERD64_LIBDIR"
-Specifiy the 32-bit library path containing libconsumer.so.
+Specify the 32-bit library path containing libconsumer.so.
 \fB--consumerd64-libdir\fP override this variable.
 .IP "LTTNG_DEBUG_NOCLONE"
 Debug-mode disabling use of clone/fork. Insecure, but required to allow
@@ -175,6 +187,8 @@ the timeout of the operating system (this is the default).
 Specify the path that contains the XML session configuration schema (xsd).
 .IP "LTTNG_KMOD_PROBES"
 Specify the kernel modules probes that should be loaded by the session daemon.
+.IP "LTTNG_EXTRA_KMOD_PROBES"
+Specify extra kernel modules probes that should be loaded by the session daemon.
 .SH "SEE ALSO"
 
 .PP
@@ -187,7 +201,7 @@ babeltrace(1), lttng-ust(3), lttng(1)
 For unprivileged user running lttng-sessiond, the maximum number of file
 descriptors per process is usually 1024. This limits the number of traceable
 applications since for each instrumented application there is two file
-descriptors per-CPU and one more socktet for bidirectional communication.
+descriptors per-CPU and one more socket for bidirectional communication.
 
 For the root user, the limit is bumped to 65535. Future version will deal with
 this limitation.
@@ -233,5 +247,5 @@ Montreal for the LTTng journey.
 .PP
 lttng-tools was originally written by Mathieu Desnoyers, Julien Desfossez and
 David Goulet. More people have since contributed to it. It is currently
-maintained by David Goulet <dgoulet@efficios.com>.
+maintained by Jérémie Galarneau <jeremie.galarneau@efficios.com>.
 .PP