aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorMagnus Henoch <[email protected]>2012-07-25 12:47:56 +0100
committerMagnus Henoch <[email protected]>2012-07-25 12:47:56 +0100
commit6c6e745b6939cf0a9907a32495e58aab7bbb4b2d (patch)
treea56fe89a01fc9a20cb76d49a24a68216b677996e /erts
parent92eb89bd630e822cfc93a07dad7d6c7a25f45d63 (diff)
downloadotp-6c6e745b6939cf0a9907a32495e58aab7bbb4b2d.tar.gz
otp-6c6e745b6939cf0a9907a32495e58aab7bbb4b2d.tar.bz2
otp-6c6e745b6939cf0a9907a32495e58aab7bbb4b2d.zip
Doc fix: link from erlang:now/0 to os:timestamp/0
Sometimes os:timestamp/0 is more appropriate than erlang:now/0. The documentation for the former has a link to the latter; this patch adds a link in the other direction to make os:timestamp/0 more visible.
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erlang.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e4f245975b..e69f223897 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2863,6 +2863,10 @@ os_prompt% </pre>
<p>It can only be used to check the local time of day if
the time-zone info of the underlying operating system is
properly configured.</p>
+ <p>If you do not need the return value to be unique and
+ monotonically increasing, use
+ <seealso marker="kernel:os#timestamp/0">os:timestamp/0</seealso>
+ instead to avoid some overhead.</p>
</desc>
</func>
<func>