diff options
| author | Patrik Nyblom <[email protected]> | 2011-06-21 12:18:15 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-06-21 12:18:15 +0200 |
| commit | b781506f927672fe22c3fba20e25d39ee64c9594 (patch) | |
| tree | cba3158ffd2f41e6493342d884382bfb2eaa672e /lib/stdlib/doc | |
| parent | 22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342 (diff) | |
| parent | b9d8ae5aa52774ed0ce12c9d21ad7f3670c2dca1 (diff) | |
| download | otp-b781506f927672fe22c3fba20e25d39ee64c9594.tar.gz otp-b781506f927672fe22c3fba20e25d39ee64c9594.tar.bz2 otp-b781506f927672fe22c3fba20e25d39ee64c9594.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/stdlib/doc')
| -rw-r--r-- | lib/stdlib/doc/src/calendar.xml | 15 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/io.xml | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index 4876b37127..f8db48e00c 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -75,13 +75,13 @@ <datatypes> <datatype> - <name name="t_datetime"/> + <name name="datetime"/> </datatype> <datatype> - <name name="t_datetime1970"/> + <name name="datetime1970"/> </datatype> <datatype> - <name name="t_date"/> + <name name="date"/> </datatype> <datatype> <name name="year"/> @@ -100,7 +100,7 @@ <name name="day"/> </datatype> <datatype> - <name name="t_time"/> + <name name="time"/> </datatype> <datatype> <name name="hour"/> @@ -118,12 +118,7 @@ <name name="ldom"/> </datatype> <datatype> - <name name="t_now"/> - <desc><p>See <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>.</p> - </desc> - </datatype> - <datatype> - <name name="t_yearweeknum"/> + <name name="yearweeknum"/> </datatype> <datatype> <name name="weeknum"/> diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index af9c75d546..667d758e29 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -439,7 +439,7 @@ ok</pre> <item> <p>Prints the argument with the <c>string</c> syntax. The argument is, if no Unicode translation modifier is present, an - <seealso marker="erts:erlang#iolist_definition">I/O list</seealso>, a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters + iolist(), a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters are printed without quotes. The string is first truncated by the given precision and then padded and justified to the given field width. The default precision is the field width.</p> |