aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-07-09 11:53:01 +0200
committerBruce Yinhe <[email protected]>2014-07-09 11:53:01 +0200
commit329bf2e9c9b3c2e4b89dc120342e3775e9b2f6d4 (patch)
tree8eab838897825de1da8c39192ddcbae2604c4b5b /erts
parent61215c1c5ca8a2f2ca9972d1a18f3d8d2d305223 (diff)
parentb56aac7450542b29b54e201195a7104f19bbdfd6 (diff)
downloadotp-329bf2e9c9b3c2e4b89dc120342e3775e9b2f6d4.tar.gz
otp-329bf2e9c9b3c2e4b89dc120342e3775e9b2f6d4.tar.bz2
otp-329bf2e9c9b3c2e4b89dc120342e3775e9b2f6d4.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erlang.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 9ad42374bf..84168397f6 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4968,7 +4968,7 @@ true</pre>
<desc>
<p>Note that the run-time is the sum of the run-time for all
threads in the Erlang run-time system and may therefore be greater
- than the wall-clock time.</p>
+ than the wall-clock time. The time is returned in milliseconds.</p>
<pre>
> <input>statistics(runtime).</input>
{1690,1620}