aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
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/inets/doc
parent7fcb9c4b3df1ec2edfdb187635ea8dcd856dc65d (diff)
parentfa5cc308af8c073832cc7b58dd52fa2f523582cc (diff)
downloadotp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.gz
otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.bz2
otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.zip
Merge branch 'maint'
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/notes.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index ed07f80d37..42183b8cc5 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -45,8 +45,6 @@
</item>
</list>
</section>
-
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -158,7 +156,20 @@
</section>
</section>
+<section><title>Inets 5.9.2.2</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>Inets 5.9.2.1</title>
<section><title>Improvements and New Features</title>
<list>