diff options
| author | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
| commit | ff305c1a15e34f1c8d4f923a8f0e532b4e946512 (patch) | |
| tree | a2278c08fc60ad4d62e512f350db68981bee496a /lib/inets/doc/src/notes.xml | |
| parent | 45305535f3348d8ea9a637b2236fd079e147971c (diff) | |
| parent | da49021ad3323f90c95a65962b6dfff5a7b139f6 (diff) | |
| download | otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.gz otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.bz2 otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.zip | |
Merge branch 'bmk/inets/inets58_integration'
Diffstat (limited to 'lib/inets/doc/src/notes.xml')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 87a8c173a5..79b7dfab4a 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -35,17 +35,22 @@ <section><title>Inets 5.8</title> <section><title>Improvements and New Features</title> +<!-- <p>-</p> +--> -<!-- <list> <item> - <p>[httpc|httpd] Added support for IPv6 with ssl. </p> - <p>Own Id: OTP-5566</p> + <p>[ftpc] Add a config option to specify a + <seealso marker="ftp#dtimeout">data connect timeout</seealso>. + That is how long the ftp client will wait for the server to connect + to the data socket. If this timeout occurs, an error will be + returned to the caller and the ftp client process will be + terminated. </p> + <p>Own Id: OTP-9545</p> </item> </list> ---> </section> |