-The `lttng add-context` command adds one or more context fields to a
-channel.
-
-Channels are created with the man:lttng-enable-channel(1) command.
-
-When context fields are added to a channel, all the events emitted
-within this channel contain the dynamic values of those context fields.
-
-If the option:--session option is omitted, the current tracing session
-is used. If the option:--channel option is omitted, the context fields
-are added to all the selected tracing session's channels.
-
-Many context fields can be added to a channel at once by repeating the
-option:--type option.
-
-perf counters are available as per-CPU (`perf:cpu:` prefix) as well as
-per-thread (`perf:thread:` prefix) counters. Currently, per-CPU counters
-can only be used in the Linux kernel tracing domain, while per-thread
-counters can only be used in the user space tracing domain.
-
-Application-specific context fields can be added to a channel using the
-following syntax:
-
+The `lttng add-context` command can:
+
+Without the option:--list option::
+ Add one or more context fields to be recorded by LTTng to the event
+ records of:
++
+With the option:--session='SESSION' option:::
+ The recording session named 'SESSION'.
+
+Without the option:--session option:::
+ The current recording session (see man:lttng-concepts(7) to learn
+ more about the current recording session).
+
+With the option:--channel='CHANNEL':::
+ The channel named 'CHANNEL'.
+
+Without the option:--channel option:::
+ *All* the channels of the selected recording session.
+
+With the option:--list option::
+ List the available context field types.
+
+See man:lttng-concepts(7) to learn more about recording sessions and
+channels.
+
+Repeat the option:--type='TYPE' option to add more than one context
+field to be recorded. 'TYPE' is one of:
+
+* A statically-known, or built-in context field name.
+
+* A perf counter name:
++
+--
+Per-CPU::
+ Prefix: `perf:cpu:`
++
+Only available with the option:--kernel option.
+
+Per-thread::
+ Prefix: `perf:thread:`
++
+Only available with the option:--userspace, option:--jul,
+option:--log4j, or option:--log4j2 option.
+--
++
+Add Performance Monitoring Unit (PMU) counter context fields by raw ID
+with the ++perf:cpu:raw:r++__N__++:++__NAME__ (option:--kernel option)
+or ++perf:thread:raw:r++__N__++:++__NAME__ (option:--userspace,
+option:--jul, option:--log4j, or option:--log4j2 option) types, with:
++
+--
+'N'::
+ A hexadecimal event descriptor which follows the man:perf-record(1)
+ format: a concatenation of the event number and umask value which
+ the manufacturer of the processor provides.
++
+The possible values for this part are processor-specific.
+
+'NAME'::
+ Custom name to identify the counter.
+--
+
+* An LTTng application-specific context field name:
++
+--