aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
committerMagnus Lidén <[email protected]>2013-09-17 10:22:16 +0200
commit5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch)
treefaa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/inets
parent36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff)
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
downloadotp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip
Merge tag 'OTP_R16B02'
The R16B02 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/notes.xml46
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 46 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 42183b8cc5..4e0dc8bd37 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,51 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 5.9.5</title>
+ <section><title>Inets 5.9.6</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ httpc: Allow content body in DELETE requests. Thanks to
+ James Wheare.</p>
+ <p>
+ Own Id: OTP-11190</p>
+ </item>
+ <item>
+ <p>
+ Add missing brackets to report formatting on ftp_progress
+ process exit. Thanks to Artur Wilniewczyc.</p>
+ <p>
+ Own Id: OTP-11202</p>
+ </item>
+ <item>
+ <p>
+ Fix some errors in the inets documentation. Thanks to
+ Johannes Weissl.</p>
+ <p>
+ Own Id: OTP-11210</p>
+ </item>
+ <item>
+ <p>
+ Fix various typos in httpd, inets. Thanks to Tomohiko
+ Aono.</p>
+ <p>
+ Own Id: OTP-11226</p>
+ </item>
+ <item>
+ <p>
+ Fix httpd config option 'erl_script_nocache'. Thanks to
+ Johannes Weissl.</p>
+ <p>
+ Own Id: OTP-11260</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 5.9.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 3f464c8684..36463d9388 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 5.9.5
+INETS_VSN = 5.9.6
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"