Use compiler-agnostic defines to silence warning

[lttng-tools.git] / doc / man / lttng-list.1.txt

diff --git a/doc/man/lttng-list.1.txt b/doc/man/lttng-list.1.txt
index e9c12ae43847692e46db956b91a516e61a2de198..6de96fa4f65545c892dc1a9f1d0dadfc1143c33f 100644 (file)
--- a/doc/man/lttng-list.1.txt
+++ b/doc/man/lttng-list.1.txt
@@ -25,14 +25,14 @@ List the channels and recording event rules of a recording session:
 
 [verse]
 *lttng* ['linkgenoptions:(GENERAL OPTIONS)'] *list* [option:--channel='CHANNEL'] 'SESSION'
-      [option:--kernel] [option:--userspace] [option:--jul] [option:--log4j] [option:--python]
+      [option:--kernel] [option:--userspace] [option:--jul] [option:--log4j] [option:--log4j2] [option:--python]
 
 List the available LTTng tracepoints, Linux system calls, and/or
 Java/Python loggers:
 
 [verse]
 *lttng* ['linkgenoptions:(GENERAL OPTIONS)'] *list* [option:--fields]
-      [option:--kernel [option:--syscall]] [option:--userspace] [option:--jul] [option:--log4j] [option:--python]
+      [option:--kernel [option:--syscall]] [option:--userspace] [option:--jul] [option:--log4j] [option:--log4j2] [option:--python]
 
 
 DESCRIPTION
@@ -64,8 +64,8 @@ With the 'SESSION' argument::
             their recording event rules.
 +
 Use the dedicated tracing domain options (option:--kernel,
-option:--userspace, option:--jul, option:--log4j, and option:--python)
-to only show specific channels.
+option:--userspace, option:--jul, option:--log4j, option:--log4j2, and
+option:--python) to only show specific channels.
 
 Without the 'SESSION' argument and with at least one dedicated tracing domain option::
 +
@@ -77,21 +77,21 @@ With the option:--kernel option::
         The available, instrumented Linux system calls.
 With the option:--userspace option::
     The available LTTng user space tracepoints.
-With the option:--jul, option:--log4j, and/or option:--python options::
-    The available `java.util.logging`, Apache log4j, and/or Python
+With the option:--jul, option:--log4j, option:--log4j2, and/or option:--python options::
+    The available `java.util.logging`, Apache Log4j 1.x, Apache Log4j 2 and/or Python
     logger names.
 --
 +
 Also list the available instrumentation point fields with the
 option:--fields option.
 
-See man:lttng-concept(7) to learn more about recording sessions, tracing
+See man:lttng-concepts(7) to learn more about recording sessions, tracing
 domains, channels, recording event rules, and instrumentation points.
 
 See the ``<<examples,EXAMPLES>>'' section below for usage examples.
 
 List the channels and recording event rules of the current recording
-session (see man:lttng-concept(7) to learn more) with the
+session (see man:lttng-concepts(7) to learn more) with the
 man:lttng-status(1) command.
 
 
@@ -116,9 +116,16 @@ option:-k, option:--kernel::
 
 option:-l, option:--log4j::
     Without the 'SESSION' argument:::
-        List the Apache log4j logger names.
+        List the Apache Log4j 1.x logger names.
     With the 'SESSION' argument:::
-        Only list the Apache log4j channels and their recording event
+        Only list the Apache Log4j 1.x channels and their recording event
+        rules.
+
+option:--log4j2::
+    Without the 'SESSION' argument:::
+        List the Apache Log4j 2 logger names.
+    With the 'SESSION' argument:::
+        Only list the Apache Log4j 2 channels and their recording event
         rules.
 
 option:-p, option:--python::