aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-05-23 14:45:08 +0200
committerLukas Larsson <[email protected]>2017-05-23 14:45:08 +0200
commit70f78dcf8e65eb0da6b843d49d0cd3115c76f1c0 (patch)
treeddc516a76e09d8ea09e4d325386d2431edbf95ad
parent53f0661b89cf944b4c0bed0113e0101cd56e6444 (diff)
parentd4bac182e5395ec2d0f4da5b9487488cb4a40707 (diff)
downloadotp-70f78dcf8e65eb0da6b843d49d0cd3115c76f1c0.tar.gz
otp-70f78dcf8e65eb0da6b843d49d0cd3115c76f1c0.tar.bz2
otp-70f78dcf8e65eb0da6b843d49d0cd3115c76f1c0.zip
Merge branch 'lukas/erts/signal_service_docs/OTP-14186'
* lukas/erts/signal_service_docs/OTP-14186: kernel: Add doc link from os man page to signal service
-rw-r--r--lib/kernel/doc/src/kernel_app.xml1
-rw-r--r--lib/kernel/doc/src/os.xml5
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 9fccb4c7ac..75e1e18d86 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -58,6 +58,7 @@
</section>
<section>
+ <marker id="erl_signal_server"/>
<title>OS Signal Event Handler</title>
<p>Asynchronous OS signals may be subscribed to via the Kernel applications event manager
(see <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 64c5cbe571..0e9add4161 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -174,8 +174,9 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
<tag><c>handle</c></tag>
<item>
- This signal will notify <c>erl_signal_server</c> when it is received by
- the Erlang runtime system.
+ This signal will notify
+ <seealso marker="kernel_app#erl_signal_server"><c>erl_signal_server</c></seealso>
+ when it is received by the Erlang runtime system.
</item>
</taglist>
</desc>