diff options
author | Anders Svensson <[email protected]> | 2016-09-12 22:31:33 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2016-09-12 22:31:33 +0200 |
commit | 58cc6bb63216d66975b8b9a895c0596925a8571d (patch) | |
tree | 469e10081c0cc0c85a63ad67d4ce1cf8c50be900 /lib/diameter/doc/src/diameter_tcp.xml | |
parent | 5620f7b8e8444bbaf5ad7ba17b842aae2a8f5d9d (diff) | |
parent | 3863fc2feecff6f9945082d0b08ff8e423a8da4c (diff) | |
download | otp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.gz otp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.bz2 otp-58cc6bb63216d66975b8b9a895c0596925a8571d.zip |
Merge branch 'anders/diameter/19.1/OTP-13838' into maint
* anders/diameter/19.1/OTP-13838:
vsn -> 1.12.1
Update appup for 19.1
Fix xmllint errors in documentation
Remove documentation overkill
Don't run traffic tests in parallel when {string_decode, true}
Remove copyright from generated dictionary modules
Fix dictionary function typo
Fix dictionary typo in relay example
Diffstat (limited to 'lib/diameter/doc/src/diameter_tcp.xml')
-rw-r--r-- | lib/diameter/doc/src/diameter_tcp.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml index 00ccc39c15..6ca280c52b 100644 --- a/lib/diameter/doc/src/diameter_tcp.xml +++ b/lib/diameter/doc/src/diameter_tcp.xml @@ -150,7 +150,7 @@ Options <c>binary</c>, <c>packet</c> and <c>active</c> cannot be specified. Also, option <c>port</c> can be specified for a listening transport to specify the local listening port, the default being the standardized -3868 if unspecified. +3868. Note that the option <c>ip</c> specifies the local address.</p> <p> |