aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-07-25 09:11:35 +0200
committerHenrik Nord <[email protected]>2014-07-25 09:11:35 +0200
commit62081266545df8f5eda8e2043f33055cfe575126 (patch)
treedc93dae0f598aa576ffc782ef0182b2ca86fa787 /lib/kernel/doc/src
parent7bb870b42928264cab08977349e2f8bf78645c1b (diff)
downloadotp-62081266545df8f5eda8e2043f33055cfe575126.tar.gz
otp-62081266545df8f5eda8e2043f33055cfe575126.tar.bz2
otp-62081266545df8f5eda8e2043f33055cfe575126.zip
fix xml file merge messup
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/notes.xml35
1 files changed, 19 insertions, 16 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index b75644a847..f92770603a 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -151,7 +151,6 @@
</list>
</section>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -292,25 +291,29 @@
corrected. </p> <p> Thanks to Max Treskin. </p>
<p>
Own Id: OTP-11730</p>
-<section><title>Kernel 2.16.4.1</title>
-
- <section><title>Known Bugs and Problems</title>
- <list>
- <item>
- <p>
- When using gen_tcp:connect and the <c>fd</c> option with
- <c>port</c> and/or <c>ip</c>, the <c>port</c> and
- <c>ip</c> options were ignored. This has been fixed so
- that if <c>port</c> and/or <c>ip</c> is specified
- together with <c>fd</c> a bind is requested for that
- <c>fd</c>. If <c>port</c> and/or <c>ip</c> is not
- specified bind will not be called.</p>
- <p>
- Own Id: OTP-12061</p>
</item>
</list>
</section>
+</section>
+<section><title>Kernel 2.16.4.1</title>
+
+ <section><title>Known Bugs and Problems</title>
+ <list>
+ <item>
+ <p>
+ When using gen_tcp:connect and the <c>fd</c> option with
+ <c>port</c> and/or <c>ip</c>, the <c>port</c> and
+ <c>ip</c> options were ignored. This has been fixed so
+ that if <c>port</c> and/or <c>ip</c> is specified
+ together with <c>fd</c> a bind is requested for that
+ <c>fd</c>. If <c>port</c> and/or <c>ip</c> is not
+ specified bind will not be called.</p>
+ <p>
+ Own Id: OTP-12061</p>
+ </item>
+ </list>
+ </section>
</section>
<section><title>Kernel 2.16.4</title>