aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-04-26 15:21:41 +0200
committerHans Bolinder <[email protected]>2018-04-26 15:21:41 +0200
commitbfde922a6308a7f0956cf688ab38cbdbffbba41d (patch)
tree84eacd924ce5babf063ff81a2d6910a11de23511 /lib/stdlib/doc/src
parent9779a7fe2dd318f9b1e5a2d4b3b4e413200d0f9c (diff)
parent83515e39e7c321910082fa3ef8a06a659c51f70a (diff)
downloadotp-bfde922a6308a7f0956cf688ab38cbdbffbba41d.tar.gz
otp-bfde922a6308a7f0956cf688ab38cbdbffbba41d.tar.bz2
otp-bfde922a6308a7f0956cf688ab38cbdbffbba41d.zip
Merge branch 'hasse/stdlib/calendar_systemtime/OTP-13413'
* hasse/stdlib/calendar_systemtime/OTP-13413: stdlib: Add system time functions to module calendar
Diffstat (limited to 'lib/stdlib/doc/src')
-rw-r--r--lib/stdlib/doc/src/calendar.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 65b3edcdf6..0c4a30ce16 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2016</year>
+ <year>1996</year><year>2018</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -339,6 +339,22 @@
</func>
<func>
+ <name name="system_time_to_local_time" arity="2"/>
+ <fsummary>Convert system time to local date and time.</fsummary>
+ <desc>
+ <p>Converts a specified system time into local date and time.</p>
+ </desc>
+ </func>
+
+ <func>
+ <name name="system_time_to_universal_time" arity="2"/>
+ <fsummary>Convert system time to universal date and time.</fsummary>
+ <desc>
+ <p>Converts a specified system time into universal date and time.</p>
+ </desc>
+ </func>
+
+ <func>
<name name="time_difference" arity="2"/>
<fsummary>Compute the difference between two times (deprecated).
</fsummary>