diff options
| author | Anders Svensson <[email protected]> | 2013-01-25 11:06:57 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-01-25 11:06:57 +0100 |
| commit | 61f8a41388d95f6b8c0e2e5a06de586cecf184c6 (patch) | |
| tree | 5c4a531e8ee983c57f472cf427d13ca13856c6ac /lib/diameter/doc/src/diameter_tcp.xml | |
| parent | 7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962 (diff) | |
| parent | 4f2f6392737407e2d04adc09b44ebdbdf03a904d (diff) | |
| download | otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.gz otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.bz2 otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.zip | |
Merge branch 'anders/diameter/R16A_release/OTP-10608'
* anders/diameter/R16A_release/OTP-10608:
vsn -> 1.4
Update appup
Spec fix
Test makefile tweak
Warn about applications/capabilities mismatches in doc
Minor documentation fixes
Remove upgrade code not needed at a major release
Comment fix
Add patch target to makefile
Diffstat (limited to 'lib/diameter/doc/src/diameter_tcp.xml')
| -rw-r--r-- | lib/diameter/doc/src/diameter_tcp.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml index e3b8c733b7..fe2389d57d 100644 --- a/lib/diameter/doc/src/diameter_tcp.xml +++ b/lib/diameter/doc/src/diameter_tcp.xml @@ -26,7 +26,7 @@ <erlref> <header> <copyright> -<year>2011</year><year>2012</year> +<year>2011</year><year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -65,9 +65,8 @@ It can be specified as the value of a <c>transport_module</c> option to &mod_add_transport; and implements the behaviour documented in &man_transport;. -TLS security is supported, both as an upgrade following -capabilities exchange as specified by &the_rfc; and -at connection establishment as in the current draft standard.</p> +TLS security is supported, either as an upgrade following +capabilities exchange or at connection establishment.</p> <p> Note that the ssl application is required for TLS and must be started |