aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-23 16:31:47 +0200
committerFredrik Gustafsson <[email protected]>2013-08-23 16:31:47 +0200
commitcefaaa6eddafbd3fd418eec5551819a82935e3b3 (patch)
tree36990f0931083fb6703bc97706b47b264bb2f388 /lib/ssl/doc/src
parent7fcb9c4b3df1ec2edfdb187635ea8dcd856dc65d (diff)
parentfa5cc308af8c073832cc7b58dd52fa2f523582cc (diff)
downloadotp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.gz
otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.bz2
otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/doc/src')
-rw-r--r--lib/ssl/doc/src/notes.xml17
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 5db4bea654..fb6b45c904 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -25,7 +25,6 @@
<file>notes.xml</file>
</header>
<p>This document describes the changes made to the SSL application.</p>
-
<section><title>SSL 5.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
@@ -100,7 +99,6 @@
</section>
<section><title>SSL 5.2.1</title>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -126,9 +124,20 @@
</section>
</section>
-
+<section><title>SSL 5.1.2.1</title>
+<section><title>Improvements and New Features</title>
+<list>
+ <item>
+ <p>
+ Make log_alert configurable as option in ssl, SSLLogLevel
+ added as option to inets conf file</p>
+ <p>
+ Own Id: OTP-11259</p>
+ </item>
+</list>
+</section>
+</section>
<section><title>SSL 5.2</title>
-
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>