aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-06-25 15:00:35 +0200
committerHans Nilsson <[email protected]>2018-06-25 15:00:35 +0200
commit42901d90e4bdd44949a13488d228b77f0eda5aa9 (patch)
tree64f71539b2b6bb94c8815cd6c9615b5c0cdf41f5 /lib/inets
parent3fa9e059f48534044033484aa612c1ff4a65bcf3 (diff)
parentaa490b13a7f98e54c48fea3537f02614f1145ffc (diff)
downloadotp-42901d90e4bdd44949a13488d228b77f0eda5aa9.tar.gz
otp-42901d90e4bdd44949a13488d228b77f0eda5aa9.tar.bz2
otp-42901d90e4bdd44949a13488d228b77f0eda5aa9.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssh: Report the signal name if there is an exit-signal to sftpd ssh: Bug fix sftp error codes ssh: Fix ssh_xfer decode_ATTR error for Vsn=4 syntax_tools: Fix a bug regarding reverting map types. Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/vsn.mk lib/syntax_tools/doc/src/notes.xml lib/syntax_tools/vsn.mk otp_versions.table
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/notes.xml22
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index f4bf4b1e1f..d967f56576 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -79,7 +79,6 @@
</list>
</section>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -91,7 +90,26 @@
</list>
</section>
-</section>
+ </section>
+
+
+ <section><title>Inets 6.5.2.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Options added for setting low-level properties on the
+ underlying TCP connections. The options are:
+ <c>sock_ctrl</c>, <c>sock_data_act</c> and
+ <c>sock_data_pass</c>. See the manual for details.</p>
+ <p>
+ Own Id: OTP-15120 Aux Id: ERIERL-192 </p>
+ </item>
+ </list>
+ </section>
+
+ </section>
<section><title>Inets 6.5.2</title>