aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-03-11 11:38:31 +0100
committerRickard Green <[email protected]>2016-03-11 11:38:31 +0100
commit9042f9f26fc42fc108c3e3711cf3bfdae2d3312d (patch)
treee5dbfab092f4fb64feb8d3b3286667f75b752125 /lib/kernel
parente12c4583c7479a49ae71086e42f62addd209dfe1 (diff)
parent465df59bbdb127e5132e7874ff57917852161590 (diff)
downloadotp-9042f9f26fc42fc108c3e3711cf3bfdae2d3312d.tar.gz
otp-9042f9f26fc42fc108c3e3711cf3bfdae2d3312d.tar.bz2
otp-9042f9f26fc42fc108c3e3711cf3bfdae2d3312d.zip
Merge branch 'rickard/doc-fix'
* rickard/doc-fix: Fix doc build
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/seq_trace.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index f4fcd222ec..857444e338 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -150,13 +150,13 @@ seq_trace:set_token(OldToken), % activate the trace token again
format and value as produced by
<c>erlang:monotonic_time(nano_seconds)</c>.</p>
</item>
+ </taglist>
<p>If multiple timestamp flags are passed, <c>timestamp</c> has
precedence over <c>strict_monotonic_timestamp</c> which
in turn has precedence over <c>monotonic_timestamp</c>. All
timestamp flags are remembered, so if two are passed
and the one with highest precedence later is disabled
the other one will become active.</p>
- </taglist>
</desc>
</func>
<func>