From 62074986287e10155293d19ac38659ed9521c018 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 20 Jun 2016 10:22:53 +0200
Subject: syntax_tools: Improve seealso:s referring to types

Extract specs och types from source files, which ensures that
seealso:s referring to, for example, erl_parse:abstract_form(), are
assigned working links.
---
 lib/syntax_tools/doc/src/Makefile  |  8 +++++++-
 lib/syntax_tools/doc/src/specs.xml | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 lib/syntax_tools/doc/src/specs.xml

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile
index ff4f3f78ff..e55222e59c 100644
--- a/lib/syntax_tools/doc/src/Makefile
+++ b/lib/syntax_tools/doc/src/Makefile
@@ -81,10 +81,15 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
 XML_FLAGS += 
+SPECS_FLAGS = -I../../include
 DVIPS_FLAGS += 
 
 # ----------------------------------------------------
@@ -93,7 +98,7 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man
+docs: man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -120,6 +125,7 @@ clean clean_docs:
 	rm -f $(MAN3DIR)/*
 	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ 
 
 # ----------------------------------------------------
diff --git a/lib/syntax_tools/doc/src/specs.xml b/lib/syntax_tools/doc/src/specs.xml
new file mode 100644
index 0000000000..04c3a494e7
--- /dev/null
+++ b/lib/syntax_tools/doc/src/specs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_epp_dodger.xml"/>
+  <xi:include href="../specs/specs_erl_comment_scan.xml"/>
+  <xi:include href="../specs/specs_erl_prettypr.xml"/>
+  <xi:include href="../specs/specs_erl_recomment.xml"/>
+  <xi:include href="../specs/specs_erl_syntax.xml"/>
+  <xi:include href="../specs/specs_erl_syntax_lib.xml"/>
+  <xi:include href="../specs/specs_erl_tidy.xml"/>
+  <xi:include href="../specs/specs_igor.xml"/>
+  <xi:include href="../specs/specs_merl.xml"/>
+  <xi:include href="../specs/specs_merl_transform.xml"/>
+  <xi:include href="../specs/specs_prettypr.xml"/>
+</specs>
-- 
cgit v1.2.3


From 37e14c395a0d3621d65552b3954856d1cbeaed9a Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 20 Sep 2016 09:36:54 +0200
Subject: Prepare release

---
 lib/syntax_tools/doc/src/notes.xml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index ef207f7c3d..82c4484d96 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,40 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug where <c>erl_tidy</c> crashed on the tilde
+	    character when printing to standard output. </p>
+          <p>
+	    Own Id: OTP-13725 Aux Id: ERL-151, PR-1071 </p>
+        </item>
+        <item>
+	    <p><c>merl_transform</c> could get into an infinite loop
+	    when syntactically incorrect text was passed to a
+	    <c>merl:qquote/2,3</c> call.</p>
+          <p>
+	    Own Id: OTP-13755</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Improve types and specs in OTP documentation generated
+	    from Erlang source files. </p>
+          <p>
+	    Own Id: OTP-13720 Aux Id: ERL-120 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.0</title>
 
     <section><title>Improvements and New Features</title>
-- 
cgit v1.2.3


From fc0427be6d482182ec70f3cd87c73027cfb17ea9 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 9 Dec 2016 11:45:22 +0100
Subject: Prepare release

---
 lib/syntax_tools/doc/src/notes.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 82c4484d96..e8de0ffce2 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The address to the FSF in the license header has been
+	    updated.</p>
+          <p>
+	    Own Id: OTP-14084</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From dc57404252c47520f352834ad9be45ad684f96c9 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 4 May 2017 17:05:25 +0200
Subject: Prepare release

---
 lib/syntax_tools/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index e8de0ffce2..11c37459d6 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.2</title>
+
+    <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>Syntax_Tools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From eace29905be436d77245656b2511c9a9c2c67c90 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 5 May 2017 13:15:42 +0200
Subject: Revert "Prepare release"

This reverts commit dc57404252c47520f352834ad9be45ad684f96c9.
---
 lib/syntax_tools/doc/src/notes.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 11c37459d6..e8de0ffce2 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
-<section><title>Syntax_Tools 2.1.2</title>
-
-    <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>Syntax_Tools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From eaf8ca41dfa4850437ad270d3897399c9358ced0 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 30 May 2017 16:15:30 +0200
Subject: Prepare release

---
 lib/syntax_tools/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index e8de0ffce2..11c37459d6 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.2</title>
+
+    <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>Syntax_Tools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 32275a2fc0b86d1f1b124706afc80f3ff92216eb Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 31 May 2017 16:21:00 +0200
Subject: Revert "Prepare release"

This reverts commit eaf8ca41dfa4850437ad270d3897399c9358ced0.
---
 lib/syntax_tools/doc/src/notes.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 11c37459d6..e8de0ffce2 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
-<section><title>Syntax_Tools 2.1.2</title>
-
-    <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>Syntax_Tools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 43718d3b81d7f3d08e25047e22d579801bbe5044 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 14 Jun 2017 15:36:21 +0200
Subject: Update copyright year

---
 lib/syntax_tools/doc/src/notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index e8de0ffce2..c2c6448ed6 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2016</year>
+      <year>2007</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-- 
cgit v1.2.3


From c18b13d4c8aa31b145703bbbf228fb07d6b2a0a5 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 21 Jun 2017 10:53:19 +0200
Subject: Prepare release

---
 lib/syntax_tools/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/syntax_tools/doc/src')

diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index c2c6448ed6..f85d963919 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.2</title>
+
+    <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>Syntax_Tools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3