aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-20 09:58:49 +0200
committerHenrik Nord <[email protected]>2015-05-20 09:59:00 +0200
commit2cfbcabd62f5473add108244f7e3a231832706f3 (patch)
tree261c0573a13e5e5e717a0f478721c688c440f02a /lib/stdlib/doc
parent7cedd7e123d85365782500251ab87125002ebd17 (diff)
parent6e24ffab6c682383a1c284fc066e59c680c4c62e (diff)
downloadotp-2cfbcabd62f5473add108244f7e3a231832706f3.tar.gz
otp-2cfbcabd62f5473add108244f7e3a231832706f3.tar.bz2
otp-2cfbcabd62f5473add108244f7e3a231832706f3.zip
Merge branch 'richcarl/add-uptime-function'
* richcarl/add-uptime-function: Add uptime() shell command OTP-12752
Diffstat (limited to 'lib/stdlib/doc')
-rw-r--r--lib/stdlib/doc/src/c.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index b49fa6ad67..b43d4786ae 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -232,6 +232,14 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
</desc>
</func>
<func>
+ <name name="uptime" arity="0"/>
+ <fsummary>Print node uptime</fsummary>
+ <desc>
+ <p>Prints the node uptime (as given by
+ <c>erlang:statistics(wall_clock)</c>), in human-readable form.</p>
+ </desc>
+ </func>
+ <func>
<name>xm(ModSpec) -> void()</name>
<fsummary>Cross reference check a module</fsummary>
<type>