Merged in master and stable-2.8, thanks!

Jérémie

On Tue, May 24, 2016 at 2:28 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  doc/man/lttng-stop.1.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/man/lttng-stop.1.txt b/doc/man/lttng-stop.1.txt
> index 6405d7b..e2997e6 100644
> --- a/doc/man/lttng-stop.1.txt
> +++ b/doc/man/lttng-stop.1.txt
> @@ -18,7 +18,7 @@ DESCRIPTION
>  The `lttng stop` command stops the various LTTng tracers for a given
>  active tracing session.
>
> -Stoping the LTTng tracers has the effect that all enabled event rules
> +Stopping the LTTng tracers has the effect that all enabled event rules
>  within enabled channels cannot make event sources _emit_ trace events
>  anymore.
>
> --
> 2.7.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com