aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-03-02 10:18:11 +0100
committerLukas Larsson <[email protected]>2018-03-02 10:18:11 +0100
commitfb218aaf3ef9da8f21a95f7e5a96e0210812d04b (patch)
tree129a01c9aac8670cfe7c6a6485a818bfa1425366 /lib/stdlib/doc
parentd17ef36e2f0c81540dfc71e77cce91a4ff604f0c (diff)
parent8bf5e7b1d38faf9c495c34b2eff6044d700993ff (diff)
downloadotp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.tar.gz
otp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.tar.bz2
otp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.zip
Merge branch 'lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940' into maint
* lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940: stdlib: Fix doc link in timer kernel: Fix handling of os:cmd option max_size in win
Diffstat (limited to 'lib/stdlib/doc')
-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