Merged, thanks!

Jérémie

On 6 October 2016 at 15:36, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
>  doc/babeltrace.1 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/babeltrace.1 b/doc/babeltrace.1
> index 979b909..67bbd57 100644
> --- a/doc/babeltrace.1
> +++ b/doc/babeltrace.1
> @@ -86,7 +86,7 @@ Show full debug info source and binary paths (if available)
>  .TP
>
>  .fi
> -Formats available: ctf, lttng-live, dummy, text, ctf_metadata.
> +Formats available: ctf, lttng-live, dummy, text, ctf-metadata.
>
>  .SH "ENVIRONMENT VARIABLES"
>
> --
> 2.1.4
>



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