aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-03-02 10:18:34 +0100
committerLukas Larsson <[email protected]>2018-03-02 10:18:34 +0100
commit5d4267657b2ef41d33cfd6ed920186bcf215d520 (patch)
tree84471426bfb9a02060345fb72319a73f0a90bfec /lib/stdlib
parent73fc86ea0c79f4b1fbc434ba4261345b6d6e772f (diff)
parentfb218aaf3ef9da8f21a95f7e5a96e0210812d04b (diff)
downloadotp-5d4267657b2ef41d33cfd6ed920186bcf215d520.tar.gz
otp-5d4267657b2ef41d33cfd6ed920186bcf215d520.tar.bz2
otp-5d4267657b2ef41d33cfd6ed920186bcf215d520.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/timer.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index fcaccdb2cb..350847bf7d 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -270,7 +270,7 @@
<item>
<p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
<anno>Arguments</anno>)</c> and measures the elapsed real time as
- reported by <seealso marker="os:timestamp/0">
+ reported by <seealso marker="kernel:os#timestamp/0">
<c>os:timestamp/0</c></seealso>.</p>
<p>Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where
<c><anno>Time</anno></c> is the elapsed real time in