aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2014-09-22 15:58:35 +0200
committerIngela Anderton Andin <ingela@erlang.org>2014-09-22 15:58:35 +0200
commitf5919f44bba5cd8451735086e75f6483e000b2a1 (patch)
tree27e4cc6e380ed8926715b67b7d6fe8ce9272ea4e /lib/kernel
parent937f447df79b7dfa6d7df7c8d208f23a192baffa (diff)
parentc02166a6fccac8b6108a99a6bd95ffad6ac6f709 (diff)
downloadotp-f5919f44bba5cd8451735086e75f6483e000b2a1.tar.gz
otp-f5919f44bba5cd8451735086e75f6483e000b2a1.tar.bz2
otp-f5919f44bba5cd8451735086e75f6483e000b2a1.zip
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/error_logger.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index 3815b0877c..df2f0b01ee 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -58,7 +58,7 @@
specific events. (<c>add_report_handler/1,2</c>). Also, there is
a useful event handler in STDLIB for multi-file logging of events,
see <c>log_mf_h(3)</c>.</p>
- <p>Warning events was introduced in Erlang/OTP R9C. To retain
+ <p>Warning events were introduced in Erlang/OTP R9C. To retain
backwards compatibility, these are by default tagged as errors,
thus showing up as error reports in the logs. By using
the command line flag <c><![CDATA[+W <w | i>]]></c>, they can instead