diff options
| author | Siri Hansen <[email protected]> | 2018-08-07 11:40:09 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2018-08-07 11:40:09 +0200 |
| commit | 66d69480b30a3d01bcc9e0dcf4e534a65fe74325 (patch) | |
| tree | 11aaab9f1c9b2e0301cb6274004ad6361f37c817 /lib | |
| parent | b5bb8600a451c14b018e435204300d5a7020f000 (diff) | |
| parent | 873c62aef28e3fc33eaf17ea8ec91976d53fdc10 (diff) | |
| download | otp-66d69480b30a3d01bcc9e0dcf4e534a65fe74325.tar.gz otp-66d69480b30a3d01bcc9e0dcf4e534a65fe74325.tar.bz2 otp-66d69480b30a3d01bcc9e0dcf4e534a65fe74325.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/doc/src/ct.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/kernel_app.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml index b51dee266b..c0380c4142 100644 --- a/lib/common_test/doc/src/ct.xml +++ b/lib/common_test/doc/src/ct.xml @@ -1522,7 +1522,7 @@ <v>Hours = integer()</v> <v>Mins = integer()</v> <v>Secs = integer()</v> - <v>Millisecs = integer() | float()</v> + <v>Millisecs = integer()</v> <v>Func = {M, F, A} | function()</v> <v>M = atom()</v> <v>F = atom()</v> diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml index ccb7d17d25..15dbdb47dc 100644 --- a/lib/kernel/doc/src/kernel_app.xml +++ b/lib/kernel/doc/src/kernel_app.xml @@ -192,7 +192,7 @@ <p>To change the primary log level at runtime, use <seealso marker="logger#set_primary_config/2"> <c>logger:set_primary_config(level, Level)</c></seealso>.</p> - <p>Defaults to <c>info</c>.</p> + <p>Defaults to <c>notice</c>.</p> </item> <tag><marker id="logger_sasl_compatible"/> <c>logger_sasl_compatible = true | false</c></tag> |