aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-05-04 12:54:05 +0200
committerHenrik Nord <[email protected]>2016-05-04 12:54:05 +0200
commit91d372e23e1d19bb0c5200ba1682f9e4bc57ed76 (patch)
tree79eedbd59410d013190e63373b1e7c25d6a7862c /lib/inets/doc
parent4c8fdca47c9e727dfcc1ab2049ffea35cef76b39 (diff)
parent1ab69efa960703b86a13ea6ba96f4fd56f1565f9 (diff)
downloadotp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.gz
otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.bz2
otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.zip
Merge branch 'maint-18'
Conflicts: OTP_VERSION lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl lib/common_test/vsn.mk
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/notes.xml20
1 files changed, 19 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index bd6b76a73e..5cebce18a9 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,25 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.2.2</title>
+ <section><title>Inets 6.2.3</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Put back unused module inets_regexp and remove it in OTP
+ 19 instead as it is an incompatibility, although it is an
+ undocumented module and should not affect other
+ applications.</p>
+ <p>
+ Own Id: OTP-13533</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.2.2</title>
<section><title>Improvements and New Features</title>
<list>