diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-08-19 17:11:37 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-08-19 17:11:37 +0200 |
| commit | 92f855b86e0c5c68d98465f8dc6ba6bc90618154 (patch) | |
| tree | d25d992554e7192e2c19f838863bfcf6f318743b /lib | |
| parent | 561d22bdc961e66ca281bf0777c830ced0556a1f (diff) | |
| parent | a2670f0822fc6729df956c8ec8c381340ff0a5fb (diff) | |
| download | otp-92f855b86e0c5c68d98465f8dc6ba6bc90618154.tar.gz otp-92f855b86e0c5c68d98465f8dc6ba6bc90618154.tar.bz2 otp-92f855b86e0c5c68d98465f8dc6ba6bc90618154.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 5 |
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. |