aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-08-19 17:10:33 +0200
committerIngela Anderton Andin <[email protected]>2015-08-19 17:10:33 +0200
commita2670f0822fc6729df956c8ec8c381340ff0a5fb (patch)
treedebf7f36ba76e1a55792e5299fab575a91878252 /lib
parentfe349b73219d4b481cd6063d1c931c0ff202ab73 (diff)
parent85524e912e645d528ecd601aaaf8b1697ec92114 (diff)
downloadotp-a2670f0822fc6729df956c8ec8c381340ff0a5fb.tar.gz
otp-a2670f0822fc6729df956c8ec8c381340ff0a5fb.tar.bz2
otp-a2670f0822fc6729df956c8ec8c381340ff0a5fb.zip
Merge branch 'ia/ssl/doc/duplicate' into maint
* ia/ssl/doc/duplicate: ssl: Remove duplicate documentation
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/ssl.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 52d68c1b4a..6c977bdb74 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -664,11 +664,6 @@ fun(srp, Username :: string(), UserState :: term()) ->
cipher suite can encipher.
</item>
- <tag><c>{psk_identity, string()}</c></tag>
- <item>Specifies the server identity hint the server presents to the client.
- </item>
- <tag><c>{log_alert, boolean()}</c></tag>
- <item>If false, error reports will not be displayed.</item>
<tag><c>{honor_cipher_order, boolean()}</c></tag>
<item>If true, use the server's preference for cipher selection. If false
(the default), use the client's preference.