aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-20 11:51:05 +0200
committerHans Nilsson <[email protected]>2018-04-20 11:51:05 +0200
commit0343b68b053ee97b2ef70ea07b9aa87e8842c591 (patch)
tree27e2f211cb8082896699873dce95fa71f2c3f8b7 /lib/inets/doc
parentf15f615f9185077b02c011ac28257e8365c01e75 (diff)
parentf2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff)
downloadotp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.gz
otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.bz2
otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release erl_interface: Optimize latin1_to_utf8 and friend inets: Fix broken httpc options handling erl_interface: Fix ei_connect ssh: Fix server crashes for exit-normal signals ssh: Fix ssh_sftpd:handle_op not returning State ic: Optimize oe_ei_encode_atom
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/notes.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 0417e07de8..672ef49c0c 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,22 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.5</title>
+ <section><title>Inets 6.5.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix broken options handling in httpc (ERL-441).</p>
+ <p>
+ Own Id: OTP-15007</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>