From 1409b6ae110f60c410e83d1923dd59ae3659a887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 1 Feb 2017 16:44:50 +0100
Subject: kernel: Document signal server

---
 lib/kernel/doc/src/os.xml | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'lib/kernel/doc/src/os.xml')

diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 739ac35d2a..6ba69d12a3 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -11,7 +11,7 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
- 
+
           http://www.apache.org/licenses/LICENSE-2.0
 
       Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
-    
+
     </legalnotice>
 
     <title>os</title>
@@ -155,6 +155,32 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       </desc>
     </func>
 
+    <func>
+      <name name="set_signal" arity="2"/>
+      <fsummary>Enables or disables handling of OS signals.</fsummary>
+      <desc>
+          <p>Enables or disables OS signals.</p>
+          <p>Each signal my be set to one of the following options:</p>
+          <taglist>
+              <tag><c>ignore</c></tag>
+              <item>
+                  This signal will be ignored.
+              </item>
+
+              <tag><c>default</c></tag>
+              <item>
+                  This signal will use the default signal handler for the operating system.
+              </item>
+
+              <tag><c>handle</c></tag>
+              <item>
+                  This signal will notify <c>erl_signal_server</c> when it is received by
+                  the Erlang runtime system.
+              </item>
+          </taglist>
+      </desc>
+    </func>
+
     <func>
       <name name="system_time" arity="0"/>
       <fsummary>Current OS system time.</fsummary>
@@ -296,4 +322,3 @@ calendar:now_to_universal_time(TS),
     </func>
   </funcs>
 </erlref>
-
-- 
cgit v1.2.3


From 83e20c62057ebc1d8064bf57b01be560cd244e1d Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 4 May 2017 15:42:21 +0200
Subject: Update copyright year

---
 lib/kernel/doc/src/os.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/kernel/doc/src/os.xml')

diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 6ba69d12a3..64c5cbe571 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-- 
cgit v1.2.3


From d4bac182e5395ec2d0f4da5b9487488cb4a40707 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 22 May 2017 11:47:23 +0200
Subject: kernel: Add doc link from os man page to signal service

---
 lib/kernel/doc/src/os.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/kernel/doc/src/os.xml')

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>
-- 
cgit v1.2.3