aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/seealso.ent
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
committerAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
commit7d05e55951b4f3fc4af0febb965d3075e5ddf324 (patch)
tree481788ecb55b80ae8b29bb7cf6608d03fed36791 /lib/diameter/doc/src/seealso.ent
parent88c8959a685ee5c296d57e9d50de46dbb19cc1df (diff)
parent09e51b177e0b2c1528c99bdd1c354319e07bc421 (diff)
downloadotp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.gz
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.bz2
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.zip
Merge branch 'anders/diameter/dpr/OTP-12542' into maint
* anders/diameter/dpr/OTP-12542: Discard CER or DWR sent with diameter:call/4 Allow DPR to be sent with diameter:call/4 Add transport_opt() dpa_timeout Add testcase for sending DPR with diameter:call/4
Diffstat (limited to 'lib/diameter/doc/src/seealso.ent')
-rw-r--r--lib/diameter/doc/src/seealso.ent3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diameter/doc/src/seealso.ent b/lib/diameter/doc/src/seealso.ent
index 44541afb9b..8d87a4a5e7 100644
--- a/lib/diameter/doc/src/seealso.ent
+++ b/lib/diameter/doc/src/seealso.ent
@@ -4,7 +4,7 @@
%CopyrightBegin%
-Copyright Ericsson AB 2012-2014. All Rights Reserved.
+Copyright Ericsson AB 2012-2015. All Rights Reserved.
The contents of this file are subject to the Erlang Public License,
Version 1.1, (the "License"); you may not use this file except in
@@ -64,6 +64,7 @@ significant.
<!ENTITY capabilities_cb '<seealso marker="#capabilities_cb">capabilities_cb</seealso>'>
<!ENTITY capx_timeout '<seealso marker="#capx_timeout">capx_timeout</seealso>'>
<!ENTITY disconnect_cb '<seealso marker="#disconnect_cb">disconnect_cb</seealso>'>
+<!ENTITY dpa_timeout '<seealso marker="#dpa_timeout">dpa_timeout</seealso>'>
<!ENTITY transport_config '<seealso marker="#transport_config">transport_config</seealso>'>
<!ENTITY transport_module '<seealso marker="#transport_module">transport_module</seealso>'>
<!ENTITY connect_timer '<seealso marker="#connect_timer">connect_timer</seealso>'>