aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/ref_man.xml
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-05-23 09:55:05 +0200
committerLukas Larsson <[email protected]>2018-05-23 09:55:05 +0200
commit39328ee50d04bd7abfe835f295d92edd17701d64 (patch)
tree23362eca4f1e24940706e37cf8eb5cadeba550cc /lib/kernel/doc/src/ref_man.xml
parente30436394466007826456fa8dfc802c16bcfbdbb (diff)
parent4e9f0492fd46d1ba6d919883cbdd5caaff8a949b (diff)
downloadotp-39328ee50d04bd7abfe835f295d92edd17701d64.tar.gz
otp-39328ee50d04bd7abfe835f295d92edd17701d64.tar.bz2
otp-39328ee50d04bd7abfe835f295d92edd17701d64.zip
Merge branch 'lukas/kernel/logger-config/OTP-13295'
* lukas/kernel/logger-config/OTP-13295: Add Action=differs to logger_filters:domain/2 Format logger timestamps according to RFC3339 Add update_logger_config/1 and update_handler_config/2 to logger Hide handlers field in logger config map from the API Improve santiy check of formatter config Fix error_logger:tty/1 to turn on/off tty logging Add filter to sasl_h which stops log events with remote gl Remove logger env vars for format_depth, max_size and utc Fix some link errors in logger documentation kernel: Make all handler callbacks not block logger logger: Rework configuration of logger
Diffstat (limited to 'lib/kernel/doc/src/ref_man.xml')
-rw-r--r--lib/kernel/doc/src/ref_man.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml
index a633ae4832..b6c2714664 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml
@@ -32,9 +32,11 @@
</description>
<xi:include href="kernel_app.xml"/>
+ <xi:include href="app.xml"/>
<xi:include href="application.xml"/>
<xi:include href="auth.xml"/>
<xi:include href="code.xml"/>
+ <xi:include href="config.xml"/>
<xi:include href="disk_log.xml"/>
<xi:include href="erl_boot_server.xml"/>
<xi:include href="erl_ddll.xml"/>
@@ -67,6 +69,4 @@
<xi:include href="user.xml"/>
<xi:include href="wrap_log_reader.xml"/>
<xi:include href="zlib_stub.xml"/>
- <xi:include href="app.xml"/>
- <xi:include href="config.xml"/>
</application>