aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-07-26 11:46:16 +0200
committerErlang/OTP <[email protected]>2017-07-26 11:46:16 +0200
commit97a44e9d08c3499faac934269626936842872176 (patch)
tree402feb226d617c95541ca5b0498ad0fcc7778d67 /lib/kernel
parent8d6e0c30f81b70ae2485fe4f0be493acb9df2bf3 (diff)
parent36b356d8333d50efa3655d83b7473262340dbabd (diff)
downloadotp-97a44e9d08c3499faac934269626936842872176.tar.gz
otp-97a44e9d08c3499faac934269626936842872176.tar.bz2
otp-97a44e9d08c3499faac934269626936842872176.zip
Merge branch 'john/kernel/fix-disk-log-docs/OTP-14498' into maint-20
* john/kernel/fix-disk-log-docs/OTP-14498: Fix doc for the 'quiet' option; it defaults to false
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/disk_log.xml2
-rw-r--r--lib/kernel/src/kernel.appup.src4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 1be28adfb8..884cb32c0c 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -972,7 +972,7 @@
<item>
<p>Specifies if messages will be sent to
<c>error_logger</c> on recoverable errors with
- the log files. Defaults to <c>true</c>.</p>
+ the log files. Defaults to <c>false</c>.</p>
</item>
</taglist>
<p><c>open/1</c> returns <c>{ok, <anno>Log</anno>}</c> if the
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 77085b2064..f1ef70a373 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,7 +18,7 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*, OTP-20.0
%% Down to - max one major revision back
- [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*, OTP-20.0
}.