diff options
| author | Lukas Larsson <garazdawi@gmail.com> | 2018-04-09 09:30:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 09:30:24 +0200 |
| commit | 1c8187a1dd5b2c807caf73cc86657c5eae0f6569 (patch) | |
| tree | cc50d8a7a971f14b64c4712d94f794ff17694bb8 | |
| parent | 249da1f79a877e3c79b661a9e520ea8910d14726 (diff) | |
| parent | 65a4a2315ca3733070fef22f918a1cd532db20ad (diff) | |
| download | erlang-1c8187a1dd5b2c807caf73cc86657c5eae0f6569.tar.gz | |
Merge pull request #1777 from PragTob/fix-timer.tc-documentation
Reflect actual timer:tc behaviour in documentation
| -rw-r--r-- | lib/stdlib/doc/src/timer.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 350847bf7d..8e828f8f56 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -270,8 +270,8 @@ <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="kernel:os#timestamp/0"> - <c>os:timestamp/0</c></seealso>.</p> + reported by <seealso marker="erlang#monotonic_time/0"> + <c>erlang:monotonic_time/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 <em>microseconds</em>, and <c><anno>Value</anno></c> is what is |