Merge tag 'OTP-20.0' into sverker/20/binary_to_atom-utf8-crash/ERL-474/OTP-14590

3 files changed, 70 insertions, 6 deletions

diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml
index 29d546105f..1227625287 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2016</year>
+      <year>2009</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -446,7 +446,8 @@ D = [0-9]
       </item>
     </taglist>
  
-    <p>The following examples define Erlang data types:</p>
+    <p>The following examples define simplified versions of a few
+      Erlang data types:</p>
     <code> 
 Atoms [a-z][0-9a-zA-Z_]*
 
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index b826b4d03a..3fa7169f50 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,69 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Minor documentation fixes</p>
+          <p>
+	    Own Id: OTP-14276 Aux Id: PR-1357 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Miscellaneous updates due to atoms containing
+	    arbitrary Unicode characters. </p>
+          <p>
+	    Own Id: OTP-14285</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Parsetools 2.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct counting of newlines when rules with newlines
+	    are used in Leex. </p>
+          <p>
+	    Own Id: OTP-13916 Aux Id: ERL-263 </p>
+        </item>
+        <item>
+	    <p> Correct handling of Unicode in Leex. </p>
+          <p>
+	    Own Id: OTP-13919</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Parsetools 2.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Yecc generates Dialyzer suppressions to avoid
+	    warnings when operator precedence declarations are used.
+	    </p>
+          <p>
+	    Own Id: OTP-13681</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.1.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 6ec9fb5f0e..5f95b5c150 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -201,13 +201,13 @@
     <p>The grammar starts with an optional <c>header</c> section. The
       header is put first in the generated file, before the module
       declaration. The purpose of the header is to provide a means to
-      make the documentation generated by <c>EDoc</c> look nicer. Each
+      make the documentation generated by EDoc look nicer. Each
       header line should be enclosed in double quotes, and newlines
       will be inserted between the lines. For example:</p>
     <code>
 Header "%% Copyright (C)"
 "%% @private"
-"%% @Author John"</code>
+"%% @Author John".</code>
     <p>Next comes a declaration of the <c>nonterminal categories</c>
       to be used in the rules. For example:</p>
     <code type="none">