aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-04-04 16:44:13 +0200
committerIngela Anderton Andin <[email protected]>2017-04-04 17:18:22 +0200
commitfbe1980e5ca85e516648420e0fed0d00b20a0529 (patch)
tree76047c17f037a01d8447f8fd2e5e204d134a141a /lib/inets/doc/src
parenteaf6a1477c4cd812eb31814cc09bdf14c796a9ba (diff)
parentc04e4cd533d9a4185eadda3141e0783b0f5a0fae (diff)
downloadotp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.gz
otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.bz2
otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk lib/crypto/c_src/crypto.c lib/crypto/src/crypto.erl lib/ssh/src/ssh.erl
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 2ed02e021e..2aa48cd50a 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,23 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.3.6</title>
+ <section><title>Inets 6.3.7</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed a bug in ftp that made further operations after a
+ recv_chunk operation impossible.</p>
+ <p>
+ Own Id: OTP-14242</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.3.6</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>