From 6c6e745b6939cf0a9907a32495e58aab7bbb4b2d Mon Sep 17 00:00:00 2001
From: Magnus Henoch <magnus.henoch@erlang-solutions.com>
Date: Wed, 25 Jul 2012 12:47:56 +0100
Subject: 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.
---
 erts/doc/src/erlang.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'erts')

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>
-- 
cgit v1.2.3