aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-06-11 14:27:18 +0200
committerAnders Svensson <[email protected]>2013-06-11 14:27:18 +0200
commitb16dc3553bb2c5618169ede09fe479d83f7bcf40 (patch)
tree92855844fb8dbf751489b680745a097eae0d7dbf /lib
parent7041c4b9fbedf295e43795d90702bd9501346aad (diff)
parentfdd8705381fb3accd2c9becea902fe8754bbb0ec (diff)
downloadotp-b16dc3553bb2c5618169ede09fe479d83f7bcf40.tar.gz
otp-b16dc3553bb2c5618169ede09fe479d83f7bcf40.tar.bz2
otp-b16dc3553bb2c5618169ede09fe479d83f7bcf40.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-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 58fbd3063c..f6b1f75230 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>