diff options
| author | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
| commit | 4de2006a6fed05e6b524c56ad16b6e62a9d00817 (patch) | |
| tree | 6fbcf7a565a4b5159c118bae3775230e0418252a /lib/kernel/doc/src | |
| parent | 830d1bf2e5acaad3c720a001ad338841993feacc (diff) | |
| parent | 5e57b3faccba1ae66ebd40fed23f5770eee71b04 (diff) | |
| download | otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.gz otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.bz2 otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.zip | |
Merge branch 'rickard/time-unit/OTP-13831'
* rickard/time-unit/OTP-13831:
Replace usage of deprecated time units
Diffstat (limited to 'lib/kernel/doc/src')
| -rw-r--r-- | lib/kernel/doc/src/seq_trace.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml index 5ac199b6a7..ba7259219d 100644 --- a/lib/kernel/doc/src/seq_trace.xml +++ b/lib/kernel/doc/src/seq_trace.xml @@ -129,7 +129,7 @@ seq_trace:set_token(OldToken), % activate the trace token again <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso> and a monotonically increasing integer. The time-stamp has the same format and value - as produced by <c>{erlang:monotonic_time(nano_seconds), + as produced by <c>{erlang:monotonic_time(nanosecond), erlang:unique_integer([monotonic])}</c>.</p> </item> <tag><c>set_token(monotonic_timestamp, <anno>Bool</anno>)</c></tag> @@ -141,7 +141,7 @@ seq_trace:set_token(OldToken), % activate the trace token again <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso>. The time-stamp has the same format and value as produced by - <c>erlang:monotonic_time(nano_seconds)</c>.</p> + <c>erlang:monotonic_time(nanosecond)</c>.</p> </item> </taglist> <p>If multiple timestamp flags are passed, <c>timestamp</c> has |