aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-01-14 16:12:36 +0100
committerSverker Eriksson <[email protected]>2016-01-14 16:12:36 +0100
commit67f70b6585b652c8eb1f7eaae336732f5ca97acf (patch)
treea03f1aa405591eb2a1d9f756fc2bf38c85e3b314 /erts/doc/src
parentf8da487826f96a7c5baf84074639cae03aee6b0b (diff)
parent43a7421c36d3feddb238b92426f938f11ef91174 (diff)
downloadotp-67f70b6585b652c8eb1f7eaae336732f5ca97acf.tar.gz
otp-67f70b6585b652c8eb1f7eaae336732f5ca97acf.tar.bz2
otp-67f70b6585b652c8eb1f7eaae336732f5ca97acf.zip
Merge branch 'sverk/trace-doc-typo' into maint
* sverk/trace-doc-typo: erts: Correct faulty doc for erlang:trace/3
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erlang.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 64eebec936..13b16d1ed3 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8269,14 +8269,14 @@ timestamp() ->
<p>When <c>Pid</c> is scheduled to run. The process
runs in function <c>{M, F, Arity}</c>. On some rare
occasions, the current function cannot be determined,
- then the last element <c>Arity</c> is <c>0</c>.</p>
+ then the last element is <c>0</c>.</p>
</item>
<tag><c>{trace, Pid, out, {M, F, Arity} | 0}</c></tag>
<item>
<p>When <c>Pid</c> is scheduled out. The process was
running in function {M, F, Arity}. On some rare occasions,
the current function cannot be determined, then the last
- element <c>Arity</c> is <c>0</c>.</p>
+ element is <c>0</c>.</p>
</item>
<tag><c>{trace, Pid, gc_start, Info}</c></tag>
<item>