diff options
| author | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-11-04 13:14:33 +0100 |
| commit | c4fd58a394f427edf54fae75288c3b9159f9cc1a (patch) | |
| tree | 1c7c1d89b8d292546f45a342022ae659069f1ba1 /lib/kernel/doc/src/os.xml | |
| parent | ce2c23ed1d6b6dc3d1a1c7109ceae255d1203f9f (diff) | |
| parent | 4ddb88db95442d18abe654ba1ff788e98eebe375 (diff) | |
| download | otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.gz otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.tar.bz2 otp-c4fd58a394f427edf54fae75288c3b9159f9cc1a.zip | |
Merge branch 'maint'
* maint:
[erl_docgen] Correct documentation
[dialyzer] Correct documentation
[hipe] Correct documentation
[test_server] Correct documentation
[tools] Correct documentation
[erts] Correct documentation
[stdlib] Correct documentation
[kernel] Correct documentation
Conflicts:
lib/stdlib/doc/src/erl_scan.xml
Diffstat (limited to 'lib/kernel/doc/src/os.xml')
| -rw-r--r-- | lib/kernel/doc/src/os.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml index 2d2a690fea..682d4a2eac 100644 --- a/lib/kernel/doc/src/os.xml +++ b/lib/kernel/doc/src/os.xml @@ -171,8 +171,8 @@ DirOut = os:cmd("dir"), % on Win32 platform</code> </func> <func> <name name="timestamp" arity="0"/> - <type_desc variable="Timestamp">Timestamp = {MegaSecs, Secs, MicroSecs}</type_desc> <fsummary>Current OS system time on the erlang:timestamp/0 format</fsummary> + <type_desc variable="Timestamp">Timestamp = {MegaSecs, Secs, MicroSecs}</type_desc> <desc> <p>Returns current <seealso marker="erts:time_correction#OS_System_Time">OS system time</seealso> @@ -205,7 +205,7 @@ format_utc_timestamp() -> 29 Apr 2009 9:55:30.051711 </pre> <p>OS system time can also be retreived by - <c><seealso marker="#system_time/0"><c>os:system_time/0</c></seealso></c>, + <seealso marker="#system_time/0"><c>os:system_time/0</c></seealso>, and <seealso marker="#system_time/1"><c>os:system_time/1</c></seealso>.</p> </desc> </func> |