aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-01 16:34:36 +0200
committerFredrik Gustafsson <[email protected]>2013-07-01 16:34:36 +0200
commitadc8b048e72ad774a431b32088b4df8b47d509f8 (patch)
tree04996fefde72e3be3fe68de8c07682fd08b20908 /lib/inets/doc/src
parent8cece79b77952c991e62ae595bcf71cde016a052 (diff)
parent90f6229822c720d7616f9a11d1ca51e522586564 (diff)
downloadotp-adc8b048e72ad774a431b32088b4df8b47d509f8.tar.gz
otp-adc8b048e72ad774a431b32088b4df8b47d509f8.tar.bz2
otp-adc8b048e72ad774a431b32088b4df8b47d509f8.zip
Merge branch 'maint-r15' into maint-r16
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.appup.src lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 72d67ddb4a..d2e7ade5d6 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,6 @@
<file>notes.xml</file>
</header>
-
<section><title>Inets 5.9.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
@@ -93,7 +92,6 @@
</section>
<section><title>Inets 5.9.4</title>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -161,6 +159,19 @@
</section>
+<section><title>Inets 5.9.2.1</title>
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Fixed obsolete error report in inets.</p>
+ <p>
+ Own Id: OTP-11185 Aux Id: seq12357 </p>
+ </item>
+ </list>
+ </section>
+</section>
+
<section><title>Inets 5.9.2</title>
<section><title>Improvements and New Features</title>