aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-06-11 14:27:09 +0200
committerAnders Svensson <[email protected]>2013-06-11 14:27:09 +0200
commitfdd8705381fb3accd2c9becea902fe8754bbb0ec (patch)
tree1983ac5ce8ce3c9e80fd4f38cde2504ae4a4a613 /lib/diameter/doc/src
parent47e81de2e656767fbd3bc4b6f5d73631dcc3bb92 (diff)
parent9cdad614c0d6e84958afd1b1d82389abfa1b9788 (diff)
downloadotp-fdd8705381fb3accd2c9becea902fe8754bbb0ec.tar.gz
otp-fdd8705381fb3accd2c9becea902fe8754bbb0ec.tar.bz2
otp-fdd8705381fb3accd2c9becea902fe8754bbb0ec.zip
Merge branch 'anders/diameter/request_spawn/OTP-11060' into maint
* anders/diameter/request_spawn/OTP-11060: Minor doc fix
Diffstat (limited to 'lib/diameter/doc/src')
-rw-r--r--lib/diameter/doc/src/diameter.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 3c9aebc6af..db19fbb271 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -878,7 +878,8 @@ of a single Diameter node across multiple Erlang nodes.</p>
<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>
+specifies another value.
+Options <c>monitor</c> and <c>link</c> are ignored.</p>
<p>
Defaults to the empty list.</p>
@@ -1179,7 +1180,8 @@ transport.</p>
<item>
<p>
An options list passed to &spawn_opt; when spawning a process for an
-incoming Diameter request.</p>
+incoming Diameter request.
+Options <c>monitor</c> and <c>link</c> are ignored.</p>
<p>
Defaults to the list configured on the service if not specified.</p>