aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-23 16:30:50 +0200
committerFredrik Gustafsson <[email protected]>2013-08-23 16:30:50 +0200
commitfa5cc308af8c073832cc7b58dd52fa2f523582cc (patch)
treebc1b7caf4b56406bdf63ba72faf261c1e51ce6a2 /lib/inets/doc/src
parent10530282667123151c1c24842f6e4bfbd3b59a76 (diff)
parent614816910235c0941b2f36da520610e777b35fc3 (diff)
downloadotp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.gz
otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.bz2
otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/inets/doc/src')
-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 d2e7ade5d6..f6bb2cca49 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>