aboutsummaryrefslogtreecommitdiffstats
path: root/lib/syntax_tools/doc
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/syntax_tools/doc
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/syntax_tools/doc')
-rw-r--r--lib/syntax_tools/doc/src/notes.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 7ba90a6495..76c2d6ecbd 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -33,29 +33,28 @@
application.</p>
<section><title>Syntax_Tools 2.1.5</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
+ <section><title>Improvements and New Features</title>
<list>
<item>
- <p> Fix a bug regarding reverting map types. </p>
<p>
- Own Id: OTP-15098 Aux Id: ERIERL-177 </p>
+ Update to use the new string api instead of the old.</p>
+ <p>
+ Own Id: OTP-15036</p>
</item>
</list>
</section>
+</section>
-
- <section><title>Improvements and New Features</title>
+<section><title>Syntax_Tools 2.1.4.1</title>
+ <section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
+ <p> Fix a bug regarding reverting map types. </p>
<p>
- Update to use the new string api instead of the old.</p>
- <p>
- Own Id: OTP-15036</p>
+ Own Id: OTP-15098 Aux Id: ERIERL-177 </p>
</item>
</list>
</section>
-
</section>
<section><title>Syntax_Tools 2.1.4</title>