aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erlang.xml
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-01-14 16:15:15 +0100
committerSverker Eriksson <[email protected]>2016-01-14 16:15:15 +0100
commit459fe1e1a6ca7218bdd41539ed2771631439bae5 (patch)
tree28c6cd6271cccbf90cf13352fcf28f14dcdd6fa4 /erts/doc/src/erlang.xml
parent45292e9a8a65800f298129fa3a2f661136f02ed5 (diff)
parent67f70b6585b652c8eb1f7eaae336732f5ca97acf (diff)
downloadotp-459fe1e1a6ca7218bdd41539ed2771631439bae5.tar.gz
otp-459fe1e1a6ca7218bdd41539ed2771631439bae5.tar.bz2
otp-459fe1e1a6ca7218bdd41539ed2771631439bae5.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc/src/erlang.xml')
-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 8ddbd95de5..0aea73cd87 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8367,14 +8367,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>