X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fman%2Flttng.1;h=252d3b5da5455d29c146382fa498278181106b67;hb=165aa49a26f9f5e53d8f87f092b8ebb6d441de78;hp=1475068c56f740194e1b2d161e3cc7df6ec9d0ca;hpb=b76d7efae967ebad27aade3c4c3d3f5cf216deec;p=lttng-tools.git

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index 1475068c5..252d3b5da 100644
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
@@ -261,7 +261,7 @@ URL, if one is specified, as the default snapshot output.  Every channel will be
 in overwrite mode and with mmap output (splice not supported).
 .TP
 .BR "\-\-live [USEC]"
-Set the session exclusively in live mode. The paremeter is the delay in micro
+Set the session exclusively in live mode. The parameter is the delay in micro
 seconds before the data is flushed and streamed. The live mode allows you to
 stream the trace and view it while it's being recorded by any tracer. For that,
 you need a lttng-relayd and this session requires a network URL (\-U or
@@ -749,8 +749,10 @@ List available domain(s)
 Load tracing session configuration
 
 If NAME is omitted, all session configurations found in both the user's session
-configuration directory and the system session configuration directory will be
-loaded.
+configuration directory (default: ~/.lttng/sessions/) and the system session
+configuration directory (default: /etc/lttng/sessions/) will be loaded. Note
+that the sessions in the user directory are loaded first and then the system
+wide directory are loaded.
 
 .B OPTIONS:
 
@@ -762,7 +764,8 @@ Show summary of possible options and commands.
 Load all session configurations (default).
 .TP
 .BR "\-i, \-\-input-path PATH"
-Specify the input path for session configurations.
+Specify the input path for session configurations. This overrides the default
+session configuration directory.
 .TP
 .BR "\-f, -\-force"
 Overwrite current session configuration(s) if a session of the same name
@@ -777,8 +780,11 @@ Save tracing session configuration
 
 If SESSION is omitted, all session configurations will be saved to individual
 \fB.lttng\fP files under the user's session configuration directory (default:
-~/.lttng/sessions/ or /var/run/lttng/sessions/ for root user). The default
-session configuration file naming scheme is \fBSESSION.lttng\fP.
+~/.lttng/sessions/). The default session configuration file naming scheme is
+\fBSESSION.lttng\fP.
+
+For instance, a user in the tracing group saving a session from a root session
+daemon will save it in her/his user directory.
 
 .B OPTIONS:
 
@@ -879,7 +885,7 @@ Apply to session name.
 Name of the snapshot's output.
 .TP
 .BR "\-m, \-\-max-size SIZE"
-Maximum size in bytes of the snapshot. The maxium size does not include the
+Maximum size in bytes of the snapshot. The maximum size does not include the
 metadata file. Human readable format is accepted: {+k,+M,+G}. For instance,
 \-\-max-size 5M
 
@@ -1064,7 +1070,7 @@ found.
 .PP
 If you encounter any issues or usability problem, please report it on our
 mailing list <lttng-dev@lists.lttng.org> to help improve this project or
-at https://bugs.lttng.org which is a bugtracker.
+at https://bugs.lttng.org which is a bug tracker.
 .PP
 
 .SH "CREDITS"
@@ -1100,5 +1106,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