Merge branch 'maint'

1 files changed, 27 insertions, 3 deletions

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 77d2381d2e..58fbd3063c 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY spawn_opt
+  '<seealso marker="erts:erlang#spawn_opt-2">erlang:spawn_opt/2</seealso>'>
   <!ENTITY nodes
   '<seealso marker="erts:erlang#nodes-0">erlang:nodes/0</seealso>'>
   <!ENTITY make_ref
@@ -27,12 +29,12 @@ Version 1.1, (the "License"); you may not use this file except in
 compliance with the License. You should have received a copy of the
 Erlang Public License along with this software. If not, it can be
 retrieved online at http://www.erlang.org/.
-    
+
 Software distributed under the License is distributed on an "AS IS"
 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 the License for the specific language governing rights and limitations
 under the License.
-    
+
 </legalnotice>
 
 <title>diameter(3)</title>
@@ -871,6 +873,17 @@ of a single Diameter node across multiple Erlang nodes.</p>
 </note>
 </item>
 
+<tag><c>{spawn_opt, [term()]}</c></tag>
+<item>
+<p>
+An options list passed to &spawn_opt; when spawning a process for an
+incoming Diameter request, unless the transport in question
+specifies another value.</p>
+
+<p>
+Defaults to the empty list.</p>
+</item>
+
 <tag><c>{use_shared_peers, boolean() | [node()] | evaluable()}</c></tag>
 <item>
 <p>
@@ -1161,6 +1174,17 @@ Defaults to 30000 for a connecting transport and 60000 for a listening
 transport.</p>
 </item>
 
+<marker id="spawn_opt"/>
+<tag><c>{spawn_opt, [term()]}</c></tag>
+<item>
+<p>
+An options list passed to &spawn_opt; when spawning a process for an
+incoming Diameter request.</p>
+
+<p>
+Defaults to the list configured on the service if not specified.</p>
+</item>
+
 <marker id="transport_config"/>
 <tag><c>{transport_config, term()}</c></tag>
 <tag><c>{transport_config, term(), &dict_Unsigned32; | infinity}</c></tag>
@@ -1626,7 +1650,7 @@ The <c>caps</c> entry identifies the capabilities sent by the local
 node and received from the peer during capabilities exchange.
 The <c>port</c> entry displays socket-level information about the
 transport connection.
-The <c>statistics</c> entry presents Diameter-level counters, 
+The <c>statistics</c> entry presents Diameter-level counters,
 an entry like <c>{{{0,280,1},recv},2}</c> saying that the client has
 received 2 DWR messages: <c>{0,280,1} = {Application_Id, Command_Code,
 R_Flag}</c>.</p>