diff options
author | Fredrik Gustafsson <[email protected]> | 2012-08-14 09:41:20 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-08-14 09:41:20 +0200 |
commit | ce6691c02f5bea8ecb0478edd68a555067de37d2 (patch) | |
tree | 7d50de874603a04ce5a5fca5d2f8c0f0d2ee3877 | |
parent | e386c0ca2d6fc8866f26864b2ad2689ca0400f39 (diff) | |
parent | 0c9d90f314f364e5b1301ec89d762baabc57c7aa (diff) | |
download | otp-ce6691c02f5bea8ecb0478edd68a555067de37d2.tar.gz otp-ce6691c02f5bea8ecb0478edd68a555067de37d2.tar.bz2 otp-ce6691c02f5bea8ecb0478edd68a555067de37d2.zip |
Merge branch 'maint'
-rw-r--r-- | erts/doc/src/erlang.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index b691bb9d58..35ae44f018 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -2465,6 +2465,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> |