aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-13 17:36:42 +0200
committerFredrik Gustafsson <[email protected]>2012-08-13 17:36:42 +0200
commit0c9d90f314f364e5b1301ec89d762baabc57c7aa (patch)
tree6045bf3d75fb2cf0a85017eb08c916b78a807ee5 /erts/doc
parent10284487779ec3bf3656926d6692c6a9f38be81c (diff)
parent6c6e745b6939cf0a9907a32495e58aab7bbb4b2d (diff)
downloadotp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.tar.gz
otp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.tar.bz2
otp-0c9d90f314f364e5b1301ec89d762baabc57c7aa.zip
Merge branch 'mh/doc-now-vs-timestamp/OTP-10180' into maint
* mh/doc-now-vs-timestamp/OTP-10180: Doc fix: link from erlang:now/0 to os:timestamp/0
Diffstat (limited to 'erts/doc')
-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>